Switch to official setup-node action for cache

galaxyproject · Feb 10, 2023 · e84124c · e84124c
1 parent 45c0701
commit e84124c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 }}