Unverified Commit ff7565dd authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_22.05' into release_23.0

parents 9dc2ca80 075e6307

.github/workflows/integration_selenium.yaml

+3 −1
Original line number Diff line number Diff line
@@ -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:
@@ -68,7 +71,6 @@ jobs: 
          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

        working-directory: 'galaxy root'

.github/workflows/selenium.yaml

+3 −1
Original line number Diff line number Diff line
@@ -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
@@ -68,7 +71,6 @@ jobs: 
        with:

          path: 'galaxy root/.venv'

          key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-selenium

      - 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'

.github/workflows/setup_selenium.yaml

0 → 100644
+8 −0
Original line number Diff line number Diff line 
on:

  workflow_call:

jobs:

  setup_chromedriver:

    runs-on: ubuntu-latest

    steps:

      - name: Install chromedriver

        uses: mvdbeek/setup-chromedriver@chromedriver_puppeteer