Merge tag 'v3.10.0' into 535--change-multidev-deploy-to-manual-only

Lullabot · Aug 26, 2024 · 722a25e · 722a25e
2 parents d87182e + a33924d
commit 722a25e
Show file tree

Hide file tree

Showing 59 changed files with 3,917 additions and 3,355 deletions.
diff --git a/.github/workflows/DrainpipeDev.yml b/.github/workflows/DrainpipeDev.yml
@@ -3,7 +3,7 @@ name: Push Drainpipe Dev Package
 on:
   push:
     branches:
-      - main
+      - '**'
     tags:
       - 'v*'
 
@@ -21,14 +21,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Add drainpipe-dev deploy key in order to run git clone
+      - uses: ./scaffold/github/actions/common/setup-git
+        with:
+          git-name: Drainpipe Bot
+          git-email: [email protected]
+
+      - name: Setup SSH
         uses: webfactory/[email protected]
         with:
           ssh-private-key: ${{ secrets.DRAINPIPE_DEV_DEPLOY_KEY }}
           log-public-key: false
 
-      # Commits made by the https://github.com/apps/lullabot-drainpipe application.
-      # @see https://github.com/orgs/community/discussions/24664
       - name: Create git checkout of drainpipe-dev
         working-directory: drainpipe-dev
         run: |
@@ -37,22 +40,27 @@ jobs:
           git remote add origin [email protected]:Lullabot/drainpipe-dev.git
           git fetch origin
           git reset --mixed origin/${{ github.ref_name }} || git reset --mixed origin/main
-          git config user.name "Lullabot-Drainpipe[bot]"
-          git config user.email "157769597+Lullabot-Drainpipe[bot]@users.noreply.github.com"
-
-      - name: Push branch to drainpipe-dev
-        working-directory: drainpipe-dev
-        run: |
           git add -A
-          git commit -m "$COMMIT_MESSAGE" --allow-empty
-          git push origin ${{ github.ref_name }}
-        env:
-          # Workaround if the commit message contains quotes.
-          COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+          git commit -m "${{ github.event.commits[0].message }}" --allow-empty
 
-      - name: Push tag to drainpipe-dev
+      - name: Tag release
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
         working-directory: drainpipe-dev
         run: |
           git tag ${{ github.ref_name }}
+
+      - name: Push to drainpipe-dev
+        working-directory: drainpipe-dev
+        run: |
           git push origin ${{ github.ref_name }}
+
+      - name: Create release
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.DRAINPIPE_DEV_RELEASE_TOKEN }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/lullabot/drainpipe-dev/releases \
+            -d '{"tag_name":"${{ github.ref_name }}","name":"${{ github.ref_name }}","body":"See <a href=\"https://github.com/Lullabot/drainpipe/releases/tag/${{ github.ref_name }}\">https://github.com/Lullabot/drainpipe/releases/tag/${{ github.ref_name }}</a>","draft":false,"prerelease":false,"generate_release_notes":false}'
diff --git a/.github/workflows/DrainpipeDevClean.yml b/.github/workflows/DrainpipeDevClean.yml
@@ -0,0 +1,42 @@
+name: Clean Drainpipe Dev Package
+
+on: delete
+
+concurrency:
+  group: drainpipe-dev
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+
+jobs:
+  Drainpipe-Dev-Clean:
+    name: Push branch to drainpipe-dev
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ./scaffold/github/actions/common/setup-git
+        with:
+          git-name: Drainpipe Bot
+          git-email: [email protected]
+
+      - name: Setup SSH
+        uses: webfactory/[email protected]
+        with:
+          ssh-private-key: ${{ secrets.DRAINPIPE_DEV_DEPLOY_KEY }}
+          log-public-key: false
+
+      - name: Create git checkout of drainpipe-dev
+        working-directory: drainpipe-dev
+        run: |
+          git init
+          git branch -m ${{ github.event.ref }}
+          git remote add origin [email protected]:Lullabot/drainpipe-dev.git
+          git fetch origin
+          git reset --mixed origin/${{ github.event.ref }}
+
+      - name: Delete ref from drainpipe-dev
+        working-directory: drainpipe-dev
+        run: |
+          git push origin --delete ${{ github.event.ref }}
diff --git a/.github/workflows/TestBinaryInstaller.yml b/.github/workflows/TestBinaryInstaller.yml
@@ -13,10 +13,18 @@ concurrency:
 jobs:
   Test-Binary-Installer:
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        php-version: [ 8.1, 8.2, 8.3 ]
+        include:
+          - php-version: 8.1
+            drupal-version: ":^10"
+          - php-version: 8.2
+            drupal-version: ":^10"
     steps:
 
       - name: Create a Drupal project
-        run: composer create-project drupal/recommended-project . --ignore-platform-req=ext-gd
+        run: composer create-project drupal/recommended-project${{ matrix.drupal-version }} . --ignore-platform-reqs
 
       - uses: actions/checkout@v4
         with:
@@ -37,6 +45,7 @@ jobs:
       - name: Setup Project
         run: |
           ddev config --auto
+          ddev config --php-version ${{ matrix.php-version }}
           ddev start
           ddev composer config extra.drupal-scaffold.gitignore true
           ddev composer config --json extra.drupal-scaffold.allowed-packages '["lullabot/drainpipe-dev", "lullabot/drainpipe"]'
@@ -52,7 +61,7 @@ jobs:
 
       - name: Simulate failure
         run: |
-          ddev exec touch /var/www/html/composer-cache/files/lullabot/drainpipe/bin/task/3.28.0/task_linux_amd64.tar
+          ddev exec touch /var/www/html/composer-cache/files/lullabot/drainpipe/bin/task/3.38.0/task_linux_amd64.tar
           ddev composer install
 
       - name: Test installing without composer cache

diff --git a/.github/workflows/TestComposerLockDiff.yml b/.github/workflows/TestComposerLockDiff.yml
@@ -11,9 +11,12 @@ concurrency:
 jobs:
   Test-Composer-Lock-Diff:
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        drupal-version: [ 10, 11 ]
     steps:
       - name: Create a Drupal project
-        run: composer create-project drupal/recommended-project:10.0.9 . --ignore-platform-req=ext-gd
+        run: composer create-project drupal/recommended-project:^${{ matrix.drupal-version }} . --ignore-platform-reqs
 
       - uses: actions/checkout@v4
         with:
@@ -77,7 +80,7 @@ jobs:
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: processed-descriptions
+          name: processed-descriptions-${{ matrix.drupal-version }}
           path: |
             renovate-processed.json
             pr-template-processed.json
diff --git a/.github/workflows/TestDDEV.yml b/.github/workflows/TestDDEV.yml
@@ -13,9 +13,12 @@ concurrency:
 jobs:
   Test-DDEV-Install:
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        drupal-version: [ 10, 11 ]
     steps:
       - name: Create a Drupal project
-        run: composer create-project drupal/recommended-project . --ignore-platform-req=ext-gd
+        run: composer create-project drupal/recommended-project:^${{ matrix.drupal-version }} . --ignore-platform-reqs
 
       - uses: actions/checkout@v4
         with:
@@ -35,7 +38,6 @@ jobs:
       - name: Setup Project
         run: |
           ddev config --auto
-          ddev config --nodejs-version "18"
           ddev start
           ddev composer config extra.drupal-scaffold.gitignore true
           ddev composer config --json extra.drupal-scaffold.allowed-packages '["lullabot/drainpipe-dev", "lullabot/drainpipe"]'

diff --git a/.github/workflows/TestEnv.yml b/.github/workflows/TestEnv.yml
@@ -11,10 +11,13 @@ concurrency:
 jobs:
   Test-Env:
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        drupal-version: [ 10, 11 ]
     steps:
       - name: Create a Drupal project
         run: |
-          composer create-project drupal/recommended-project . --ignore-platform-req=ext-gd
+          composer create-project drupal/recommended-project:^${{ matrix.drupal-version }} . --ignore-platform-reqs
 
       - uses: actions/checkout@v4
         with: