From 784ac0e100fc30e51ca46822b3d496d8bdca12f3 Mon Sep 17 00:00:00 2001
From: Naveen Valecha <naveen.valecha@morpht.com>
Date: Wed, 8 Nov 2023 17:32:55 +0530
Subject: [PATCH] pantheon-upstream-convivial-composer-managed-34310: Merge
 nightly workflow into build workflow. (#6)

---
 .github/workflows/build.yml   |  3 +++
 .github/workflows/nightly.yml | 24 ------------------------
 README.md                     |  2 +-
 3 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/nightly.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4241d5e..b7d9339 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,9 @@
 name: Build and Test
 
 on:
+  schedule:
+    # Weekday (22=10pm UTC). Evaluates to 8am AEST.
+    - cron: '0 22 * * *'
   workflow_dispatch:
   push:
     branches:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
deleted file mode 100644
index 7252226..0000000
--- a/.github/workflows/nightly.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Build
-# Triggers the nightly workflow.
-on:
-  schedule:
-    # Weekday (22=10pm UTC). Evaluates to 8am AEST.
-    - cron: '0 22 * * *'
-
-jobs:
-  build:
-    name: Build Pantheon upstream Convivial Composer managed
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout.
-        uses: actions/checkout@v3
-      - name: Setup PHP and tools
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.1'
-          tools: composer:v2
-          extensions: mbstring, gd, intl, yaml, bcmath, curl
-      - name: Execute Composer install
-        run: composer install
-      - name: Validate composer.json and composer.lock
-        run: composer validate
diff --git a/README.md b/README.md
index 9973db5..ff2cf7a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Composer-enabled Drupal template
 
-[![Continous Integration](https://github.com/morpht/pantheon-upstream-convivial-composer-managed/actions/workflows/nightly.yml/badge.svg)](https://github.com/morpht/pantheon-upstream-convivial-composer-managed/actions?query=branch%3Amain)
+[![Continous Integration](https://github.com/morpht/pantheon-upstream-convivial-composer-managed/actions/workflows/build.yml/badge.svg)](https://github.com/morpht/pantheon-upstream-convivial-composer-managed/actions?query=branch%3Amain)
 
 This is Pantheon's recommended starting point for forking new [Drupal](https://www.drupal.org/) upstreams
 that work with the Platform's Integrated Composer build process. It is also the