From e84124cb825dd6ca3e302bbff373e80e26932139 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Fri, 10 Feb 2023 09:32:04 +0100
Subject: [PATCH] Switch to official setup-node action for cache

---
 .github/workflows/first_startup.yaml        | 6 ++++--
 .github/workflows/integration_selenium.yaml | 6 ++++--
 .github/workflows/jest.yaml                 | 2 +-
 .github/workflows/js_lint.yaml              | 2 +-
 .github/workflows/reports_startup.yaml      | 6 ++++--
 .github/workflows/selenium.yaml             | 6 ++++--
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/first_startup.yaml b/.github/workflows/first_startup.yaml
index 9c0d9209b28c..520888fbd3ae 100644
--- a/.github/workflows/first_startup.yaml
+++ b/.github/workflows/first_startup.yaml
@@ -48,9 +48,11 @@ jobs:
         with:
           path: .tox
           key: tox-cache-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-first-startup
-      - uses: mvdbeek/gha-yarn-cache@master
+      - uses: actions/setup-node@v3
         with:
-          yarn-lock-file: 'galaxy root/client/yarn.lock'
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Install tox
         run: pip install tox
       - name: run tests
diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml
index 9b7fa0679533..ca18308d9968 100644
--- a/.github/workflows/integration_selenium.yaml
+++ b/.github/workflows/integration_selenium.yaml
@@ -63,9 +63,11 @@ jobs:
         with:
           path: 'galaxy root/.venv'
           key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-integration-selenium
-      - uses: mvdbeek/gha-yarn-cache@master
+      - uses: actions/setup-node@v3
         with:
-          yarn-lock-file: 'galaxy root/client/yarn.lock'
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: nanasess/setup-chromedriver@v1
       - name: Run tests
         run: ./run_tests.sh --coverage -integration test/integration_selenium
diff --git a/.github/workflows/jest.yaml b/.github/workflows/jest.yaml
index 01bea00d01f8..0bbe29780435 100644
--- a/.github/workflows/jest.yaml
+++ b/.github/workflows/jest.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [16]
+        node: [18]
     steps:
       - uses: actions/checkout@v3
       - name: Setup node
diff --git a/.github/workflows/js_lint.yaml b/.github/workflows/js_lint.yaml
index a59da3aa4ad8..90b818e8b68b 100644
--- a/.github/workflows/js_lint.yaml
+++ b/.github/workflows/js_lint.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [16]
+        node: [18]
     steps:
       - uses: actions/checkout@v3
       - name: Setup node
diff --git a/.github/workflows/reports_startup.yaml b/.github/workflows/reports_startup.yaml
index 1d649d0d858f..bef55b8d3572 100644
--- a/.github/workflows/reports_startup.yaml
+++ b/.github/workflows/reports_startup.yaml
@@ -45,9 +45,11 @@ jobs:
         with:
           path: 'galaxy root/.venv'
           key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-reports-startup
-      - uses: mvdbeek/gha-yarn-cache@master
+      - uses: actions/setup-node@v3
         with:
-          yarn-lock-file: 'galaxy root/client/yarn.lock'
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Install tox
         run: pip install tox
       - name: Run tests
diff --git a/.github/workflows/selenium.yaml b/.github/workflows/selenium.yaml
index bd69bb60bc2b..d3128b02f7ce 100644
--- a/.github/workflows/selenium.yaml
+++ b/.github/workflows/selenium.yaml
@@ -63,9 +63,11 @@ jobs:
         with:
           path: 'galaxy root/.venv'
           key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-selenium
-      - uses: mvdbeek/gha-yarn-cache@master
+      - uses: actions/setup-node@v3
         with:
-          yarn-lock-file: 'galaxy root/client/yarn.lock'
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: nanasess/setup-chromedriver@v1
       - name: Run tests
         run: ./run_tests.sh --coverage -selenium lib/galaxy_test/selenium -- --num-shards=3 --shard-id=${{ matrix.chunk }}