From ee467f713a7811c18427de31b6568f72ae911813 Mon Sep 17 00:00:00 2001 From: Sally Young Date: Mon, 9 Dec 2024 16:30:13 +0000 Subject: [PATCH] remove yarn workaround --- .github/workflows/TestFunctional.yml | 5 +++-- .github/workflows/TestMetapackages.yml | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/TestFunctional.yml b/.github/workflows/TestFunctional.yml index 92f118f7..170c93e0 100644 --- 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 index 0f8a005b..5f8055a1 100644 --- 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