Merge branch 'main' into 172--global-binaries

Lullabot · Oct 26, 2023 · 664d1e9 · 664d1e9
2 parents e28747f + d133882
commit 664d1e9
Show file tree

Hide file tree

Showing 38 changed files with 183 additions and 161 deletions.
diff --git a/.github/workflows/DrainpipeDev.yml b/.github/workflows/DrainpipeDev.yml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   Drainpipe-Dev:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
 
       - name: Create a Drupal project

diff --git a/.github/workflows/TestComposerLockDiff.yml b/.github/workflows/TestComposerLockDiff.yml
@@ -10,7 +10,7 @@ concurrency:
 
 jobs:
   Test-Composer-Lock-Diff:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Create a Drupal project
         run: composer create-project drupal/recommended-project:10.0.9 . --ignore-platform-req=ext-gd

diff --git a/.github/workflows/TestEnv.yml b/.github/workflows/TestEnv.yml
@@ -10,7 +10,7 @@ concurrency:
 
 jobs:
   Test-Env:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Create a Drupal project
         run: |

diff --git a/.github/workflows/TestFunctional.yml b/.github/workflows/TestFunctional.yml
@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   Build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Create a Drupal project
         run: composer create-project drupal/recommended-project . --ignore-platform-req=ext-gd
@@ -68,7 +68,7 @@ jobs:
           path: /tmp/drainpipe.zip
 
   Test-NPM:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v3
@@ -116,7 +116,7 @@ jobs:
           path: test_result
 
   Test-Yarn-Classic:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v3
@@ -164,8 +164,8 @@ jobs:
           name: test_result
           path: test_result
 
-  Test-Yarn-Berry-Node-Linker:
-    runs-on: ubuntu-latest
+  Test-Yarn-3-Node-Linker:
+    runs-on: ubuntu-22.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v3
@@ -193,6 +193,7 @@ jobs:
       - name: Setup Nightwatch
         run: |
           ddev yarn set version berry
+          ddev yarn set version 3
           ddev yarn init -y
           yarn config set nodeLinker node-modules
           ddev yarn add nightwatch nightwatch-accessibility @lullabot/nightwatch-drupal-commands lodash --dev
@@ -214,8 +215,8 @@ jobs:
           name: test_result
           path: test_result
 
-  Test-Yarn-Berry:
-    runs-on: ubuntu-latest
+  Test-Yarn-3:
+    runs-on: ubuntu-22.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v3
@@ -243,6 +244,7 @@ jobs:
       - name: Setup Nightwatch
         run: |
           ddev yarn set version berry
+          ddev yarn set version 3
           ddev yarn init -y
           echo "packageExtensions:" >> .yarnrc.yml
           echo '  "nightwatch@*":' >> .yarnrc.yml

diff --git a/.github/workflows/TestGitHubActions.yml b/.github/workflows/TestGitHubActions.yml
@@ -10,7 +10,7 @@ concurrency:
 
 jobs:
   Test-GitHub-Actions:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Create a Drupal project
         run: composer create-project drupal/recommended-project . --ignore-platform-req=ext-gd

diff --git a/.github/workflows/TestPHPUnit.yml b/.github/workflows/TestPHPUnit.yml
@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   Test-PHPUnit-Functional:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Install xmllint
         run: sudo apt-get update && sudo apt-get install -y libxml2-utils
@@ -82,7 +82,7 @@ jobs:
           expected_result: PASSED
 
   Test-PHPUnit-Functional-DTT:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Install xmllint
         run: sudo apt-get update && sudo apt-get install -y libxml2-utils
@@ -151,7 +151,7 @@ jobs:
           expected_result: PASSED
 
   Test-PHPUnit-Static:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Install xmllint
         run: sudo apt-get update && sudo apt-get install -y libxml2-utils

diff --git a/.github/workflows/TestSass.yml b/.github/workflows/TestSass.yml
@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   Build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Create a Drupal project
         run: composer create-project drupal/recommended-project . --ignore-platform-req=ext-gd
@@ -64,7 +64,7 @@ jobs:
           path: /tmp/drainpipe.zip
 
   Test-Sass-NPM:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v3
@@ -98,7 +98,7 @@ jobs:
         run: ddev task assets
 
   Test-Yarn-Classic:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: Build
     steps:
       - uses: actions/download-artifact@v3
@@ -133,7 +133,7 @@ jobs:
         run: ddev task assets
 
   Test-Yarn-Berry:
-     runs-on: ubuntu-latest
+     runs-on: ubuntu-22.04
      needs: Build
      steps:
        - uses: actions/download-artifact@v3
@@ -161,6 +161,7 @@ jobs:
        - name: Setup Sass
          run: |
            ddev yarn set version berry
+           ddev yarn set version 3
            ddev yarn init -y
            ddev yarn add @lullabot/drainpipe-sass --dev
 

diff --git a/.github/workflows/TestStatic.yml b/.github/workflows/TestStatic.yml
@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   Test-Static:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Create a Drupal project
         run: composer create-project drupal/recommended-project . --ignore-platform-req=ext-gd

diff --git a/.github/workflows/TestTugboat.yml b/.github/workflows/TestTugboat.yml
@@ -10,7 +10,7 @@ concurrency:
 
 jobs:
   Test-Tugboat:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Create a Drupal project
         run: composer create-project drupal/recommended-project . --ignore-platform-req=ext-gd
@@ -73,3 +73,45 @@ jobs:
         with:
           name: .tugboat
           path: .tugboat
+
+  Test-Non-Default-Nodejs:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Create a Drupal project
+        run: composer create-project drupal/recommended-project . --ignore-platform-req=ext-gd
+
+      - uses: actions/checkout@v3
+        with:
+          path: drainpipe
+
+      - uses: ./drainpipe/scaffold/github/actions/common/set-env
+
+      - name: Install DDEV
+        uses: ./drainpipe/scaffold/github/actions/common/ddev
+        with:
+          git-name: Drainpipe Bot
+          git-email: [email protected]
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
+      - name: Setup Project
+        run: |
+          ddev config --auto
+          ddev config --php-version "8.1"
+          ddev config --nodejs-version "16"
+          ddev config --database=mariadb:10.4
+          ddev start
+          ddev composer config extra.drupal-scaffold.gitignore true
+          ddev composer config --json extra.drupal-scaffold.allowed-packages \[\"lullabot/drainpipe\"]
+          ddev composer config --no-plugins allow-plugins.composer/installers true
+          ddev composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
+          ddev composer config --no-plugins allow-plugins.lullabot/drainpipe true
+          ddev composer config repositories.drainpipe --json '{"type": "path", "url": "drainpipe", "options": {"symlink": false}}'
+          ddev composer config minimum-stability dev
+          ddev composer config extra.drainpipe --json '{"tugboat": {}}'
+          ddev composer require lullabot/drainpipe --with-all-dependencies
+
+      - name: Test NODE_MAJOR is correct
+        run: |
+          cat .tugboat/steps/1-init.sh
+          grep -q NODE_MAJOR=16 .tugboat/steps/1-init.sh
+
diff --git a/.github/workflows/ValidateTaskfile.yml b/.github/workflows/ValidateTaskfile.yml
@@ -8,11 +8,11 @@ on:
 
 jobs:
   Validate-Example-Taskfile:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: '18'
 

diff --git a/.github/workflows/composer-plugin.yml b/.github/workflows/composer-plugin.yml
@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   Test-Composer-Plugin:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2

diff --git a/.github/workflows/test-production-build.yml b/.github/workflows/test-production-build.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   Test-Production-Build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         php-version: [7.3, 7.4, 8.0]