Merge pull request #16461 from mvdbeek/chromedriver_bump

[22.05] Bump version of chromedriver setup action
galaxyproject · Jul 26, 2023 · 075e630 · 075e630
2 parents d3f9a33 + b9c07a7
commit 075e630
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml
@@ -21,8 +21,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
+  setup-selenium:
+    uses: ./.github/workflows/setup_selenium.yaml
   test:
     name: Test
+    needs: setup-selenium
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -66,7 +69,6 @@ jobs:
       - uses: mvdbeek/gha-yarn-cache@master
         with:
           yarn-lock-file: 'galaxy root/client/yarn.lock'
-      - uses: nanasess/setup-chromedriver@v1
       - name: Run tests
         run: ./run_tests.sh --coverage -integration test/integration_selenium
         working-directory: 'galaxy root'

diff --git a/.github/workflows/selenium.yaml b/.github/workflows/selenium.yaml
@@ -21,8 +21,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
+  setup-selenium:
+    uses: ./.github/workflows/setup_selenium.yaml
   test:
     name: Test
+    needs: setup-selenium
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -66,7 +69,6 @@ jobs:
       - uses: mvdbeek/gha-yarn-cache@master
         with:
           yarn-lock-file: '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 }}
         working-directory: 'galaxy root'

diff --git a/.github/workflows/selenium_beta.yaml b/.github/workflows/selenium_beta.yaml
@@ -23,8 +23,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
+  setup-selenium:
+    uses: ./.github/workflows/setup_selenium.yaml
   test:
     name: Test
+    needs: setup-selenium
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -68,7 +71,6 @@ jobs:
       - uses: mvdbeek/gha-yarn-cache@master
         with:
           yarn-lock-file: '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 }}
         working-directory: 'galaxy root'

diff --git a/.github/workflows/setup_selenium.yaml b/.github/workflows/setup_selenium.yaml
@@ -0,0 +1,8 @@
+on:
+  workflow_call:
+jobs:
+  setup_chromedriver:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install chromedriver
+        uses: mvdbeek/setup-chromedriver@chromedriver_puppeteer