Skip to content

Commit db10480

Browse files
authored
CI: Try to not auto-cancel on master (#44682)
1 parent 9f5e609 commit db10480

File tree

6 files changed

+22
-14
lines changed

6 files changed

+22
-14
lines changed

.github/workflows/ci.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ jobs:
2323
shell: bash -l {0}
2424

2525
concurrency:
26-
group: ${{ github.ref }}-checks
27-
cancel-in-progress: ${{github.event_name == 'pull_request'}}
26+
# https://github.community/t/concurrecy-not-work-for-push/183068/7
27+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-checks
28+
cancel-in-progress: true
2829

2930
steps:
3031
- name: Checkout
@@ -102,7 +103,8 @@ jobs:
102103
runs-on: ubuntu-latest
103104

104105
concurrency:
105-
group: ${{ github.ref }}-web-docs
106+
# https://github.community/t/concurrecy-not-work-for-push/183068/7
107+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-web-docs
106108
cancel-in-progress: true
107109

108110
steps:
@@ -164,7 +166,8 @@ jobs:
164166
matrix:
165167
pattern: ["not slow and not network and not clipboard", "slow"]
166168
concurrency:
167-
group: ${{ github.ref }}-data_manager-${{ matrix.pattern }}
169+
# https://github.community/t/concurrecy-not-work-for-push/183068/7
170+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-data_manager-${{ matrix.pattern }}
168171
cancel-in-progress: true
169172

170173
steps:

.github/workflows/database.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ jobs:
3131
fail-fast: false
3232

3333
concurrency:
34-
group: ${{ github.ref }}-${{ matrix.ENV_FILE }}
35-
cancel-in-progress: ${{github.event_name == 'pull_request'}}
34+
# https://github.community/t/concurrecy-not-work-for-push/183068/7
35+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.ENV_FILE }}
36+
cancel-in-progress: true
3637

3738
services:
3839
mysql:

.github/workflows/posix.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ jobs:
4646
TEST_ARGS: ${{ matrix.settings[6] }}
4747
PYTEST_TARGET: pandas
4848
concurrency:
49-
group: ${{ github.ref }}-${{ matrix.settings[0] }}
50-
cancel-in-progress: ${{github.event_name == 'pull_request'}}
49+
# https://github.community/t/concurrecy-not-work-for-push/183068/7
50+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.settings[0] }}
51+
cancel-in-progress: true
5152

5253
steps:
5354
- name: Checkout

.github/workflows/pre-commit.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ jobs:
1111
pre-commit:
1212
runs-on: ubuntu-latest
1313
concurrency:
14-
group: ${{ github.ref }}-pre-commit
15-
cancel-in-progress: ${{github.event_name == 'pull_request'}}
14+
# https://github.community/t/concurrecy-not-work-for-push/183068/7
15+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-pre-commit
16+
cancel-in-progress: true
1617
steps:
1718
- uses: actions/checkout@v2
1819
- uses: actions/setup-python@v2

.github/workflows/python-dev.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ jobs:
3131
timeout-minutes: 80
3232

3333
concurrency:
34-
group: ${{ github.ref }}-${{ matrix.os }}-${{ matrix.pytest_target }}-dev
35-
cancel-in-progress: ${{github.event_name == 'pull_request'}}
34+
#https://github.community/t/concurrecy-not-work-for-push/183068/7
35+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.os }}-${{ matrix.pytest_target }}-dev
36+
cancel-in-progress: true
3637

3738
steps:
3839
- uses: actions/checkout@v2

.github/workflows/sdist.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ jobs:
2525
matrix:
2626
python-version: ["3.8", "3.9", "3.10"]
2727
concurrency:
28-
group: ${{github.ref}}-${{matrix.python-version}}-sdist
29-
cancel-in-progress: ${{github.event_name == 'pull_request'}}
28+
# https://github.community/t/concurrecy-not-work-for-push/183068/7
29+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{matrix.python-version}}-sdist
30+
cancel-in-progress: true
3031

3132
steps:
3233
- uses: actions/checkout@v2

0 commit comments

Comments
 (0)