From e64fb6c9013e2c35aec9655b17a429338954ac05 Mon Sep 17 00:00:00 2001
From: Paul Mitchum <paul@mile23.com>
Date: Tue, 20 Jun 2023 12:18:41 -0700
Subject: [PATCH] updating CI script

---
 .github/workflows/tests.yml | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4809d21..8e34662 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -5,21 +5,30 @@ on:
     branches: [ main ]
 
   schedule:
-    - cron: '01 07 * * *'
+    - cron: '25 08 * * *'
 
   workflow_dispatch:
     inputs:
       debug_enabled:
-        description: 'Debug with tmate set "debug_enabled"'
+        type: boolean
+        description: Debug with tmate
         required: false
-        default: "false"
+        default: false
+
+# This is required for "gautamkrishnar/keepalive-workflow"
+permissions:
+  contents: write
 
 defaults:
   run:
     shell: bash
 
 env:
-  NIGHTLY_DDEV_PR_URL: "https://nightly.link/drud/ddev/actions/runs/1720215802/ddev-linux-amd64.zip"
+  NIGHTLY_DDEV_PR_URL: "https://nightly.link/ddev/ddev/actions/runs/1720215802/ddev-linux-amd64.zip"
+  # Allow ddev get to use a github token to prevent rate limiting by tests
+  DDEV_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  # Allow `--HEAD` flag when running tests against HEAD
+  HOMEBREW_NO_INSTALL_FROM_API: 1
 
 jobs:
   tests:
@@ -37,7 +46,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - run: echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
+      - name: Set up Homebrew
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
       - name: Environment setup
         run: |
           sh ./setup-bats.sh
@@ -46,15 +57,15 @@ jobs:
 
       - name: Use ddev stable
         if: matrix.ddev_version == 'stable'
-        run: brew install drud/ddev/ddev
+        run: brew install ddev/ddev/ddev
 
       - name: Use ddev edge
         if: matrix.ddev_version == 'edge'
-        run: brew install drud/ddev-edge/ddev
+        run: brew install ddev/ddev-edge/ddev
 
       - name: Use ddev HEAD
         if: matrix.ddev_version == 'HEAD'
-        run: brew install --HEAD drud/ddev/ddev
+        run: brew install --HEAD ddev/ddev/ddev
 
       - name: Use ddev PR
         if: matrix.ddev_version == 'PR'
@@ -64,15 +75,14 @@ jobs:
           mv ddev /usr/local/bin/ddev && chmod +x /usr/local/bin/ddev
 
       - name: Download docker images
-        run: |
-          mkdir junk && pushd junk && ddev config --auto && ddev debug download-images >/dev/null
-          docker pull memcached:1.6 >/dev/null
+        run: mkdir junk && pushd junk && ddev config --auto && ddev debug download-images >/dev/null
+
       - name: tmate debugging session
         uses: mxschmitt/action-tmate@v3
         with:
           limit-access-to-actor: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
+        if: github.event.inputs.debug_enabled == 'true'
 
       - name: tests
         run: ./tests/bats/bin/bats ./tests/
@@ -80,3 +90,4 @@ jobs:
       # keepalive-workflow adds a dummy commit if there's no other action here, keeps
       # GitHub from turning off tests after 60 days
       - uses: gautamkrishnar/keepalive-workflow@v1
+        if: matrix.ddev_version == 'stable'