Merge branch 'main' into renovate/sass-1.x

Lullabot · Dec 9, 2024 · 0201239 · 0201239
2 parents 654ffac + f1330a5
commit 0201239
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/TestFunctional.yml b/.github/workflows/TestFunctional.yml
@@ -171,6 +171,7 @@ jobs:
         run: |
           ddev exec corepack disable
           ddev exec npm i -g yarn@1.22.1
+          ddev exec 'rm /usr/local/bin/yarn'
           ddev exec 'ln -s $(npm root -g)/yarn/bin/yarn /usr/local/bin/yarn'
           ddev yarn init -y
           ddev yarn add nightwatch nightwatch-accessibility @lullabot/nightwatch-drupal-commands lodash --dev

diff --git a/.github/workflows/TestMetapackages.yml b/.github/workflows/TestMetapackages.yml
@@ -129,6 +129,7 @@ jobs:
         run: |
           ddev exec corepack disable
           ddev exec npm i -g yarn@1.22.1
+          ddev exec 'rm /usr/local/bin/yarn'
           ddev exec 'ln -s $(npm root -g)/yarn/bin/yarn /usr/local/bin/yarn'
           ddev exec yarn init -y
           ddev exec yarn add file:./drainpipe/metapackages/sass --dev
@@ -275,6 +276,7 @@ jobs:
         run: |
           ddev exec corepack disable
           ddev exec npm i -g yarn@1.22.1
+          ddev exec 'rm /usr/local/bin/yarn'
           ddev exec 'ln -s $(npm root -g)/yarn/bin/yarn /usr/local/bin/yarn'
           ddev exec yarn init -y
           ddev exec yarn add focus-trap@^6.7.3

diff --git a/renovate.json b/renovate.json
@@ -1,10 +1,12 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base"
+    "config:recommended"
   ],
   "rangeStrategy": "bump",
-  "ignoreDeps": ["drainpipe"],
+  "ignoreDeps": [
+    "drainpipe"
+  ],
   "packageRules": [
     {
       "matchPackageNames": [
@@ -15,7 +17,9 @@
         "twig/twig",
         "vlucas/phpdotenv"
       ],
-      "addLabels": ["test only - do not merge"]
+      "addLabels": [
+        "test only - do not merge"
+      ]
     }
   ]
 }