diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 246f84e..0930682 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -7,8 +7,8 @@ on: branches: [ master ] concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: ${{ github.ref_name != 'master' }} jobs: e2e-tests: diff --git a/.github/workflows/go_cov.yml b/.github/workflows/go_cov.yml index 22f24c8..b28f594 100644 --- a/.github/workflows/go_cov.yml +++ b/.github/workflows/go_cov.yml @@ -9,8 +9,8 @@ on: - cron: '15 */12 * * *' concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: ${{ github.ref_name != 'master' }} jobs: test: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index baac4af..03de418 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -6,8 +6,8 @@ on: branches: [ master ] concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: ${{ github.ref_name != 'master' }} jobs: golangci: