diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a26848e89d124..ef694205beeaa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: concurrency: group: ${{ github.ref }}-checks - cancel-in-progress: true + cancel-in-progress: ${{github.event_name == 'pull_request'}} steps: - name: Checkout diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index e18d101263403..33a8d623e358f 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -31,7 +31,7 @@ jobs: concurrency: group: ${{ github.ref }}-${{ matrix.ENV_FILE }} - cancel-in-progress: true + cancel-in-progress: ${{github.event_name == 'pull_request'}} services: mysql: diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 5b9511febf3d0..6c83035316481 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -45,7 +45,7 @@ jobs: TEST_ARGS: ${{ matrix.settings[6] }} concurrency: group: ${{ github.ref }}-${{ matrix.settings[0] }} - cancel-in-progress: true + cancel-in-progress: ${{github.event_name == 'pull_request'}} steps: - name: Checkout diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index dcb33b21a8ae1..7280da66dc9b9 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest concurrency: group: ${{ github.ref }}-pre-commit - cancel-in-progress: true + cancel-in-progress: ${{github.event_name == 'pull_request'}} steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 50d7e1de233f3..0881336664efc 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -25,7 +25,7 @@ jobs: concurrency: group: ${{ github.ref }}-dev - cancel-in-progress: true + cancel-in-progress: ${{github.event_name == 'pull_request'}} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index f569a260250c0..64da432257fd1 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -23,6 +23,9 @@ jobs: fail-fast: false matrix: python-version: ["3.8", "3.9"] + concurrency: + group: ${{github.ref}}-${{matrix.python-version}}-sdist + cancel-in-progress: ${{github.event_name == 'pull_request'}} steps: - uses: actions/checkout@v2