Update orca.yml

acquia · Aug 2, 2024 · a4fb642 · a4fb642
1 parent 162f11c
commit a4fb642
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/orca.yml b/.github/workflows/orca.yml
@@ -141,15 +141,17 @@ jobs:
         run: |
           ../orca/bin/ci/self-test/before_install.sh
           ../orca/bin/ci/before_install.sh
-          # D11 requires yarn>=4.1.1
-          npm cache clean --force
-          # Remove the previous yarn installed in the container.
-          npm uninstall -g yarn
-          npm install -g corepack
-          corepack enable
-          yarn set version 4.1.1
-          yarn -v
-
+          if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && -d "$ORCA_YARN_DIR" ]]; then
+            # Install yarn 4.1.1.
+            cd "$ORCA_YARN_DIR" || exit
+            npm cache clean --force
+            # Remove the previous yarn installed in the container.
+            npm uninstall -g yarn
+            npm install -g corepack
+            corepack enable
+            yarn set version 4.1.1
+            yarn -v
+          fi
 
       - name: Install
         run: |

diff --git a/bin/ci/install.sh b/bin/ci/install.sh
@@ -17,7 +17,15 @@ fi
 
 if [[ "$ORCA_ENABLE_NIGHTWATCH" == "TRUE" && "$ORCA_SUT_HAS_NIGHTWATCH_TESTS" && -d "$ORCA_YARN_DIR" ]]; then
   (
-    cd "$ORCA_YARN_DIR" || exit
+    eval 'cd "$ORCA_YARN_DIR" || exit'
+    # Install yarn 4.1.1.
+    eval 'npm cache clean --force'
+    # Remove the previous yarn installed in the container.
+    eval 'npm uninstall -g yarn'
+    eval 'npm install -g corepack'
+    eval 'corepack enable'
+    eval 'yarn set version 4.1.1'
+    eval 'yarn -v'
     eval "yarn install"
   )
 fi