remove yarn workaround

Lullabot · Dec 9, 2024 · ee467f7 · ee467f7
1 parent 0a87313
commit ee467f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/TestFunctional.yml b/.github/workflows/TestFunctional.yml
@@ -170,8 +170,9 @@ jobs:
       - name: Setup Nightwatch
         run: |
           ddev exec corepack disable
-          #ddev exec npm i -g yarn@1.22.1
-          #ddev exec 'ln -s $(npm root -g)/yarn/bin/yarn /usr/local/bin/yarn'
+          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
@@ -128,8 +128,9 @@ jobs:
       - name: Setup Sass
         run: |
           ddev exec corepack disable
-          #ddev exec npm i -g yarn@1.22.1
-          #ddev exec 'ln -s $(npm root -g)/yarn/bin/yarn /usr/local/bin/yarn'
+          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
 
@@ -274,8 +275,9 @@ jobs:
       - name: Setup Sass
         run: |
           ddev exec corepack disable
-          #ddev exec npm i -g yarn@1.22.1
-          #ddev exec 'ln -s $(npm root -g)/yarn/bin/yarn /usr/local/bin/yarn'
+          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
           ddev exec yarn add file:./drainpipe/metapackages/javascript --dev