From 5c8898ffd932176ae7c597467bb858c4859a0c9b Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Wed, 30 Jun 2021 16:17:14 +0200 Subject: [PATCH] Cancel already running job with same ref ref is " The branch or tag ref that triggered the workflow run. For branches this in the format refs/heads/, and for tags it is refs/tags/. " --- .github/workflows/api.yaml | 3 +++ .github/workflows/api_paste.yaml | 3 +++ .github/workflows/converter_tests.yaml | 4 +++- .github/workflows/db_indexes.yaml | 3 +++ .github/workflows/docs.yaml | 3 +++ .github/workflows/first_startup.yaml | 3 +++ .github/workflows/framework.yaml | 3 +++ .github/workflows/integration.yaml | 3 +++ .github/workflows/integration_selenium.yaml | 3 +++ .github/workflows/jest.yaml | 3 +++ .github/workflows/labels-verifier.yaml | 1 - .github/workflows/lint.yaml | 3 +++ .github/workflows/maintenance_bot.yaml | 1 - .github/workflows/mulled.yaml | 3 +++ .github/workflows/osx_startup.yaml | 4 +++- .github/workflows/performance.yaml | 3 +++ .github/workflows/selenium.yaml | 3 +++ .github/workflows/toolshed.yaml | 3 +++ .github/workflows/unit.yaml | 3 +++ 19 files changed, 51 insertions(+), 4 deletions(-) diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml index 4902a94a3a96..4bd03e5bde57 100644 --- a/.github/workflows/api.yaml +++ b/.github/workflows/api.yaml @@ -2,6 +2,9 @@ name: API tests on: [push, pull_request] env: GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8' +concurrency: + group: api-${{ github.ref }} + cancel-in-progress: true jobs: test: name: Test diff --git a/.github/workflows/api_paste.yaml b/.github/workflows/api_paste.yaml index 504cd91d9992..bbde9dfe1909 100644 --- a/.github/workflows/api_paste.yaml +++ b/.github/workflows/api_paste.yaml @@ -3,6 +3,9 @@ on: [push, pull_request] env: GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8' GALAXY_TEST_USE_UVICORN: false +concurrency: + group: api-legacy-${{ github.ref }} + cancel-in-progress: true jobs: test: name: Test diff --git a/.github/workflows/converter_tests.yaml b/.github/workflows/converter_tests.yaml index a71ef00c2741..2145cfe20558 100644 --- a/.github/workflows/converter_tests.yaml +++ b/.github/workflows/converter_tests.yaml @@ -1,7 +1,9 @@ name: Converter tests on: [push, pull_request] +concurrency: + group: converter-${{ github.ref }} + cancel-in-progress: true jobs: - test: name: Test runs-on: ubuntu-18.04 diff --git a/.github/workflows/db_indexes.yaml b/.github/workflows/db_indexes.yaml index 64f46d667fa1..27e1e10661e4 100644 --- a/.github/workflows/db_indexes.yaml +++ b/.github/workflows/db_indexes.yaml @@ -1,5 +1,8 @@ name: Database indexes on: [push, pull_request] +concurrency: + group: database-${{ github.ref }} + cancel-in-progress: true defaults: run: working-directory: 'galaxy root' diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 36b2c3fe34b8..1d68508ef8e0 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -1,5 +1,8 @@ name: Build docs on: [push, pull_request] +concurrency: + group: docs-${{ github.ref }} + cancel-in-progress: true jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/first_startup.yaml b/.github/workflows/first_startup.yaml index fb3284060f1d..999b9a799fde 100644 --- a/.github/workflows/first_startup.yaml +++ b/.github/workflows/first_startup.yaml @@ -1,5 +1,8 @@ name: first startup on: [push, pull_request] +concurrency: + group: first-startup-${{ github.ref }} + cancel-in-progress: true env: YARN_INSTALL_OPTS: --frozen-lockfile jobs: diff --git a/.github/workflows/framework.yaml b/.github/workflows/framework.yaml index 280f90a7bdf4..95a4ef407577 100644 --- a/.github/workflows/framework.yaml +++ b/.github/workflows/framework.yaml @@ -1,5 +1,8 @@ name: Framework tests on: [push, pull_request] +concurrency: + group: framework-${{ github.ref }} + cancel-in-progress: true env: GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8' jobs: diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 9366868b3792..c4290b4b79e5 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -1,5 +1,8 @@ name: Integration on: [push, pull_request] +concurrency: + group: integration-${{ github.ref }} + cancel-in-progress: true env: GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8' GALAXY_TEST_AMQP_URL: 'amqp://localhost:5672//' diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml index 62d58238937d..88f7e160dab0 100644 --- a/.github/workflows/integration_selenium.yaml +++ b/.github/workflows/integration_selenium.yaml @@ -1,5 +1,8 @@ name: Integration Selenium on: [push, pull_request] +concurrency: + group: integration-selenium-${{ github.ref }} + cancel-in-progress: true env: GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8' GALAXY_TEST_SELENIUM_REMOTE: '1' diff --git a/.github/workflows/jest.yaml b/.github/workflows/jest.yaml index de1565905883..73196903d6e8 100644 --- a/.github/workflows/jest.yaml +++ b/.github/workflows/jest.yaml @@ -1,5 +1,8 @@ name: Client Unit Testing on: [push, pull_request] +concurrency: + group: client-${{ github.ref }} + cancel-in-progress: true jobs: jest: runs-on: ubuntu-latest diff --git a/.github/workflows/labels-verifier.yaml b/.github/workflows/labels-verifier.yaml index e9b272436394..f291c2c7a615 100644 --- a/.github/workflows/labels-verifier.yaml +++ b/.github/workflows/labels-verifier.yaml @@ -2,7 +2,6 @@ name: Labels Verifier on: pull_request_target: types: [closed] - jobs: onMerged: name: "Check Labels on merge" diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 79ba462a6bdd..75df3596b255 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,5 +1,8 @@ name: Python linting on: [push, pull_request] +concurrency: + group: py-lint-${{ github.ref }} + cancel-in-progress: true jobs: test: name: Test diff --git a/.github/workflows/maintenance_bot.yaml b/.github/workflows/maintenance_bot.yaml index 567faaed2b9d..de185c4725e8 100644 --- a/.github/workflows/maintenance_bot.yaml +++ b/.github/workflows/maintenance_bot.yaml @@ -2,7 +2,6 @@ name: Maintenance Bot on: pull_request_target: types: [opened, reopened, edited, ready_for_review, unlabeled] - jobs: labeler: name: Assign labels and milestone diff --git a/.github/workflows/mulled.yaml b/.github/workflows/mulled.yaml index 4527c1a1b9f2..6f778a887986 100644 --- a/.github/workflows/mulled.yaml +++ b/.github/workflows/mulled.yaml @@ -1,5 +1,8 @@ name: Mulled Unit Tests on: [push, pull_request] +concurrency: + group: mulled-${{ github.ref }} + cancel-in-progress: true jobs: test: name: Test diff --git a/.github/workflows/osx_startup.yaml b/.github/workflows/osx_startup.yaml index 44883c89d666..57aa071b155c 100644 --- a/.github/workflows/osx_startup.yaml +++ b/.github/workflows/osx_startup.yaml @@ -1,7 +1,9 @@ name: macOS startup on: [push, pull_request] +concurrency: + group: osx-first-startup-${{ github.ref }} + cancel-in-progress: true jobs: - test: name: Startup test runs-on: macos-latest diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml index dd23da13e7e6..c7838d562174 100644 --- a/.github/workflows/performance.yaml +++ b/.github/workflows/performance.yaml @@ -1,5 +1,8 @@ name: Performance tests on: [push, pull_request] +concurrency: + group: performance-${{ github.ref }} + cancel-in-progress: true env: GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8' jobs: diff --git a/.github/workflows/selenium.yaml b/.github/workflows/selenium.yaml index 25e71accb066..ce87a3971b8b 100644 --- a/.github/workflows/selenium.yaml +++ b/.github/workflows/selenium.yaml @@ -1,5 +1,8 @@ name: Selenium tests on: [push, pull_request] +concurrency: + group: selenium-${{ github.ref }} + cancel-in-progress: true env: GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8' GALAXY_TEST_SKIP_FLAKEY_TESTS_ON_ERROR: 'true' diff --git a/.github/workflows/toolshed.yaml b/.github/workflows/toolshed.yaml index 0d88af5866e7..4c4aec5efa3c 100644 --- a/.github/workflows/toolshed.yaml +++ b/.github/workflows/toolshed.yaml @@ -1,5 +1,8 @@ name: Toolshed tests on: [push, pull_request] +concurrency: + group: toolshed-${{ github.ref }} + cancel-in-progress: true env: GALAXY_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/galaxy?client_encoding=utf8' TOOL_SHED_TEST_DBURI: 'postgresql://postgres:postgres@localhost:5432/toolshed?client_encoding=utf8' diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml index 40f313fe7d86..b99c80124c2d 100644 --- a/.github/workflows/unit.yaml +++ b/.github/workflows/unit.yaml @@ -1,5 +1,8 @@ name: Unit tests on: [push, pull_request] +concurrency: + group: py-unit-${{ github.ref }} + cancel-in-progress: true jobs: test: name: Test