Merge branch 'justafish/issue-204-acquia-integration' of github.com:L…

…ullabot/drainpipe into justafish/issue-204-acquia-integration--v3
Lullabot · Feb 3, 2025 · cb3df9b · cb3df9b
2 parents e24b4a7 + e629fd2
commit cb3df9b
Show file tree

Hide file tree

Showing 9 changed files with 301 additions and 278 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "vlucas/phpdotenv": "^4|^5"
     },
     "require-dev": {
-        "composer/composer": "^2.8.3",
+        "composer/composer": "^2.8.5",
         "phpunit/phpunit": "^9.6.21"
     },
     "extra": {

diff --git a/drainpipe-dev/composer.json b/drainpipe-dev/composer.json
@@ -16,21 +16,21 @@
         "behat/mink": "^1.12.0",
         "behat/mink-browserkit-driver": "^2.2.0",
         "davidrjonas/composer-lock-diff": "^1.7",
-        "drupal/coder": "^8.3.26",
+        "drupal/coder": "^8.3.28",
         "lullabot/drainpipe": "*",
-        "mglaman/phpstan-drupal": "^1.3.2",
+        "mglaman/phpstan-drupal": "^2.0.1",
         "mikey179/vfsstream": "^1.6.12",
         "mockery/mockery": "^1.6.12",
         "phpspec/prophecy-phpunit": "^2",
-        "phpstan/phpstan-deprecation-rules": "^1.2.1",
+        "phpstan/phpstan-deprecation-rules": "^2.0.1",
         "phpunit/phpunit": "^9|^10",
         "symfony/phpunit-bridge": "^6|^7",
         "symfony/yaml": "^6|^7",
         "tijsverkoyen/convert-to-junit-xml": "^1.11.0",
-        "vincentlanglet/twig-cs-fixer": "^3.4.0"
+        "vincentlanglet/twig-cs-fixer": "^3.5.1"
     },
     "require-dev": {
-        "composer/composer": "^2.8.3"
+        "composer/composer": "^2.8.5"
     },
     "bin": [
         "bin/drainpipe-convert-to-junit-xml"

diff --git a/metapackages/javascript/package.json b/metapackages/javascript/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.15",
     "chokidar": "^3.6.0",
-    "esbuild": "^0.24.0",
+    "esbuild": "^0.24.2",
     "yargs": "^17.7.2"
   },
   "repository": {

diff --git a/metapackages/sass/package.json b/metapackages/sass/package.json
@@ -11,8 +11,8 @@
     "gulp-sass-glob": "^1.1.0",
     "gulp-sourcemaps": "^3.0.0",
     "modern-normalize": "^3.0.1",
-    "postcss": "^8.4.49",
-    "sass": "^1.83.0",
+    "postcss": "^8.5.1",
+    "sass": "^1.83.4",
     "yargs": "^17.7.2"
   },
   "repository": {

diff --git a/scaffold/gitlab/DDEV.gitlab-ci.yml b/scaffold/gitlab/DDEV.gitlab-ci.yml
@@ -28,7 +28,10 @@ cache:
     - |
       mkdir -p .ddev/homeadditions/.ssh
       # Copy private key
-      if [ "$DRAINPIPE_DDEV_SSH_PRIVATE_KEY" != "" ]; then
+      if [ "$DRAINPIPE_SSH_PRIVATE_KEY_BASE64" != "" ]; then
+        echo "$DRAINPIPE_SSH_PRIVATE_KEY_BASE64" | base64 -d > .ddev/homeadditions/.ssh/id_rsa
+        chmod 600 .ddev/homeadditions/.ssh/id_rsa
+      elif [ "$DRAINPIPE_DDEV_SSH_PRIVATE_KEY" != "" ]; then
         echo "$DRAINPIPE_DDEV_SSH_PRIVATE_KEY" > .ddev/homeadditions/.ssh/id_rsa
         chmod 600 .ddev/homeadditions/.ssh/id_rsa
       fi

diff --git a/tasks/drupal.yml b/tasks/drupal.yml
@@ -44,7 +44,7 @@ tasks:
       - echo "🚮 Dropping existing database"
       - ./vendor/bin/drush {{ .site }} sql:drop --yes
       - echo "📰 Importing database"
-      - gunzip -k $DB_DIR/db.sql.gz
+      - gunzip --keep --force $DB_DIR/db.sql.gz
       - ./vendor/bin/drush {{ .site }} sql:query --file=$DB_DIR/db.sql
       - defer: rm -f $DB_DIR/db.sql
   export-db:

diff --git a/tasks/test.yml b/tasks/test.yml
@@ -58,7 +58,7 @@ tasks:
       - |
         DIRS_ARR=({{.YAML_DIRS}})
         for DIR in "${DIRS_ARR[@]}"; do
-          ./vendor/bin/yaml-lint $DIR
+          ./vendor/bin/yaml-lint --parse-tags $DIR
         done
       - |
         DIRS_ARR=({{.TWIG_DIRS}})