Skip to content

Commit 9785f81

Browse files
authored
CI: Don't auto-cancel on master (#42467)
1 parent be88077 commit 9785f81

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
concurrency:
2525
group: ${{ github.ref }}-checks
26-
cancel-in-progress: true
26+
cancel-in-progress: ${{github.event_name == 'pull_request'}}
2727

2828
steps:
2929
- name: Checkout

.github/workflows/database.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
concurrency:
3333
group: ${{ github.ref }}-${{ matrix.ENV_FILE }}
34-
cancel-in-progress: true
34+
cancel-in-progress: ${{github.event_name == 'pull_request'}}
3535

3636
services:
3737
mysql:

.github/workflows/posix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
TEST_ARGS: ${{ matrix.settings[6] }}
4646
concurrency:
4747
group: ${{ github.ref }}-${{ matrix.settings[0] }}
48-
cancel-in-progress: true
48+
cancel-in-progress: ${{github.event_name == 'pull_request'}}
4949

5050
steps:
5151
- name: Checkout

.github/workflows/pre-commit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
concurrency:
1313
group: ${{ github.ref }}-pre-commit
14-
cancel-in-progress: true
14+
cancel-in-progress: ${{github.event_name == 'pull_request'}}
1515
steps:
1616
- uses: actions/checkout@v2
1717
- uses: actions/setup-python@v2

.github/workflows/python-dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
concurrency:
2727
group: ${{ github.ref }}-dev
28-
cancel-in-progress: true
28+
cancel-in-progress: ${{github.event_name == 'pull_request'}}
2929

3030
steps:
3131
- uses: actions/checkout@v2

.github/workflows/sdist.yml

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
python-version: ["3.8", "3.9"]
26+
concurrency:
27+
group: ${{github.ref}}-${{matrix.python-version}}-sdist
28+
cancel-in-progress: ${{github.event_name == 'pull_request'}}
2629

2730
steps:
2831
- uses: actions/checkout@v2

0 commit comments

Comments
 (0)