Merge branch 'main' into 535--change-multidev-deploy-to-manual-only

Lullabot · Aug 27, 2024 · 0d34004 · 0d34004
2 parents 722a25e + 6ea2952
commit 0d34004
Show file tree

Hide file tree

Showing 25 changed files with 579 additions and 419 deletions.
diff --git a/.github/workflows/DrainpipeDev.yml b/.github/workflows/DrainpipeDev.yml
@@ -16,7 +16,7 @@ permissions:
 
 jobs:
   Drainpipe-Dev:
-    name: Push branch to drainpipe-dev
+    name: Push to drainpipe-dev
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -39,6 +39,19 @@ jobs:
           git branch -m ${{ github.ref_name }}
           git remote add origin git@github.com:Lullabot/drainpipe-dev.git
           git fetch origin
+
+      - name: Commit changes (Tag)
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        working-directory: drainpipe-dev
+        run: |
+          git reset --mixed origin/main
+          git add -A
+          git commit -m "${{ github.event.commits[0].message }}" --allow-empty
+
+      - name: Commit changes (Branch)
+        if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
+        working-directory: drainpipe-dev
+        run: |
           git reset --mixed origin/${{ github.ref_name }} || git reset --mixed origin/main
           git add -A
           git commit -m "${{ github.event.commits[0].message }}" --allow-empty

diff --git a/.github/workflows/TestFunctional.yml b/.github/workflows/TestFunctional.yml
@@ -52,6 +52,20 @@ jobs:
           ddev composer config minimum-stability dev
           ddev composer require "lullabot/drainpipe @dev" --with-all-dependencies
           ddev composer require "lullabot/drainpipe-dev @dev" --dev --with-all-dependencies
+          git config --global user.email "no-reply@example.com"
+          git config --global user.name "Drainpipe Bot"
+          git init
+          echo "/drainpipe" >> .gitignore
+          echo "/drainpipe-dev" >> .gitignore
+          echo ".ddev/config.yaml" >> .gitignore
+          echo ".ddev/docker-compose.selenium.yaml" >> .gitignore
+          echo ".yarnrc.yml" >> .gitignore
+          echo "package.json" >> .gitignore
+          echo "yarn.lock" >> .gitignore
+          echo "package-lock.json" >> .gitignore
+          echo "README.md" >> .gitignore
+          git add .
+          git commit -m "Initial commit"
 
       - name: Setup Nightwatch
         run: |
@@ -62,6 +76,11 @@ jobs:
           ddev config --web-environment="NIGHTWATCH_DRUPAL_URL_FIREFOX=https://drupal_firefox,NIGHTWATCH_DRUPAL_URL_CHROME=https://drupal_chrome"
           ddev config --additional-hostnames="*.drainpipe"
 
+      - name: Run the site installer
+        run: |
+          ddev drush --yes site:install minimal
+          ddev drush config:export --yes
+
       - name: Create Artifact
         run: zip -r /tmp/drainpipe.zip ./
 
@@ -107,10 +126,7 @@ jobs:
 
       - name: Install Drupal
         run: |
-          ddev drush --yes site:install
-          ddev drush --uri=https://drupal_firefox --yes site:install
-          ddev drush --uri=https://drupal_chrome --yes site:install
-          ddev drush config:export --yes
+          ddev task test:siteinstall:all
 
       - name: Run Functional Tests
         run: ddev task test:functional
@@ -161,10 +177,7 @@ jobs:
 
       - name: Install Drupal
         run: |
-          ddev drush --yes site:install
-          ddev drush --uri=https://drupal_firefox --yes site:install
-          ddev drush --uri=https://drupal_chrome --yes site:install
-          ddev drush config:export --yes
+          ddev task test:siteinstall:all
 
       - name: Run Functional Tests
         run: ddev task test:functional
@@ -215,10 +228,7 @@ jobs:
 
       - name: Install Drupal
         run: |
-          ddev drush --yes site:install
-          ddev drush --uri=https://drupal_firefox --yes site:install
-          ddev drush --uri=https://drupal_chrome --yes site:install
-          ddev drush config:export --yes
+          ddev task test:siteinstall:all
 
       - name: Run Functional Tests
         run: ddev task test:functional
@@ -270,10 +280,7 @@ jobs:
 
       - name: Install Drupal
         run: |
-          ddev drush --yes site:install
-          ddev drush --uri=https://drupal_firefox --yes site:install
-          ddev drush --uri=https://drupal_chrome --yes site:install
-          ddev drush config:export --yes
+          ddev task test:siteinstall:all
 
       - name: Run Functional Tests
         run: ddev task test:functional
@@ -323,14 +330,14 @@ jobs:
           echo '  "nightwatch@*":' >> .yarnrc.yml
           echo '    dependencies:' >> .yarnrc.yml
           echo '      ws: "*"' >> .yarnrc.yml
-          ddev yarn add nightwatch nightwatch-axe-verbose @lullabot/nightwatch-drupal-commands --dev
+          echo '  "@nightwatch/vrt@*":' >> .yarnrc.yml
+          echo '    dependencies:' >> .yarnrc.yml
+          echo '      open: "^8"' >> .yarnrc.yml
+          ddev yarn add nightwatch nightwatch-axe-verbose @nightwatch/vrt @lullabot/nightwatch-drupal-commands --dev
 
       - name: Install Drupal
         run: |
-          ddev drush --yes site:install
-          ddev drush --uri=https://drupal_firefox --yes site:install
-          ddev drush --uri=https://drupal_chrome --yes site:install
-          ddev drush config:export --yes
+          ddev task test:siteinstall:all
 
       - name: Run Functional Tests
         run: ddev task test:functional
@@ -380,15 +387,15 @@ jobs:
           echo '  "nightwatch@*":' >> .yarnrc.yml
           echo '    dependencies:' >> .yarnrc.yml
           echo '      ws: "*"' >> .yarnrc.yml
+          echo '  "@nightwatch/vrt@*":' >> .yarnrc.yml
+          echo '    dependencies:' >> .yarnrc.yml
+          echo '      open: "^8"' >> .yarnrc.yml
           ddev yarn cache clear
-          ddev yarn add nightwatch nightwatch-axe-verbose @lullabot/nightwatch-drupal-commands --dev
+          ddev yarn add nightwatch nightwatch-axe-verbose @nightwatch/vrt @nightwatch/vrt @lullabot/nightwatch-drupal-commands --dev
 
       - name: Install Drupal
         run: |
-          ddev drush --yes site:install
-          ddev drush --uri=https://drupal_firefox --yes site:install
-          ddev drush --uri=https://drupal_chrome --yes site:install
-          ddev drush config:export --yes
+          ddev task test:siteinstall:all
 
       - name: Run Functional Tests
         run: ddev task test:functional

diff --git a/.github/workflows/TestPHPUnit.yml b/.github/workflows/TestPHPUnit.yml
@@ -124,7 +124,7 @@ jobs:
           ddev composer config repositories.drainpipe-dev --json '{"type": "path", "url": "drainpipe-dev", "options": {"symlink": false}}'
           ddev composer config minimum-stability dev
           ddev composer require "lullabot/drainpipe @dev" --with-all-dependencies
-          ddev composer require "lullabot/drainpipe-dev @dev" weitzman/drupal-test-traits behat/mink-selenium2-driver --dev --with-all-dependencies
+          ddev composer require "lullabot/drainpipe-dev @dev" weitzman/drupal-test-traits lullabot/mink-selenium2-driver --dev --with-all-dependencies
           # Restart is required to enable the provided Selenium containers
           ddev restart
 

diff --git a/.github/workflows/TestStatic.yml b/.github/workflows/TestStatic.yml
@@ -58,10 +58,34 @@ jobs:
           test -f phpcs.xml.dist
           test -f phpstan.neon.dist
 
+      - name: Create a git repository
+        run: |
+          git config --global user.email "no-reply@example.com"
+          git config --global user.name "Drainpipe Bot"
+          git init
+          echo "/drainpipe" >> .gitignore
+          echo "/drainpipe-dev" >> .gitignore
+          git add .
+          git commit -m "Initial commit"
+
       - name: Fix settings.php
         run: |
           sed -i '/^.*container_yamls.*$/i /** @phpstan-ignore-next-line */' web/sites/default/settings.php
 
+      - name: Test for untracked and modified files
+        id: test_untracked
+        continue-on-error: true
+        run: ddev task test:untracked
+
+      - name: Test for untracked and modified files
+        run: |
+          if [ "${{ steps.test_untracked.outcome }}" != "failure" ]; then
+            exit 1
+          fi
+          git add .
+          git commit -m "Second commit"
+          ddev task test:untracked
+
       - name: Run Static Tests
         run: ddev task test:static
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -41,6 +41,7 @@ build:
     - ddev composer require lullabot/drainpipe --with-all-dependencies
     - ddev restart
     - test -f .gitlab/drainpipe/DDEV.gitlab-ci.yml
+    - test -f .gitlab/drainpipe/Nightwatch.gitlab-ci.yml
     - ddev drush site:install minimal -y
     - echo "\$settings['config_sync_directory'] = '../config';" >> web/sites/default/settings.php
     - ddev drush config:export -y