Skip to content

Commit 026cee3

Browse files
kmiloskmilos
authored
Merge pull request #2419 from Exiv2/ci_concurrency
CI: improved in-progress job canceling
2 parents faa7cc3 + 74e41d9 commit 026cee3

14 files changed

+28
-28
lines changed

‎.github/workflows/cifuzz.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
name: CIFuzz
55
concurrency:
6-
group: ${{ github.workflow }}-${{ github.ref }}
6+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
77
cancel-in-progress: true
88
on:
99
pull_request:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
name: "CodeQL"
77

88
concurrency:
9-
group: ${{ github.workflow }}-${{ github.ref }}
9+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1010
cancel-in-progress: true
1111

1212
on:

‎.github/workflows/nightly_Linux_distributions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- cron: 0 4 * * *
88

99
concurrency:
10-
group: ${{ github.workflow }}-${{ github.ref }}
10+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1111
cancel-in-progress: true
1212

1313
name: Nightly - Linux distributions

‎.github/workflows/on_PR_linux_fuzz.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
name: On PRs - Linux-Ubuntu Quick Fuzz
66

77
concurrency:
8-
group: ${{ github.workflow }}-${{ github.ref }}
8+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
99
cancel-in-progress: true
1010

1111
on:

‎.github/workflows/on_PR_linux_matrix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: On PRs - Linux-Ubuntu Matrix
22

33
concurrency:
4-
group: ${{ github.workflow }}-${{ github.ref }}
4+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
55
cancel-in-progress: true
66

77
on:
@@ -26,7 +26,7 @@ jobs:
2626
- name: install dependencies
2727
run: |
2828
sudo apt-get install ninja-build
29-
pip3 install conan==1.52.0
29+
pip3 install conan==1.54.0
3030
3131
- name: Conan common config
3232
run: |

‎.github/workflows/on_PR_linux_special_builds.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: On PRs - Linux Special Builds
22

33
concurrency:
4-
group: ${{ github.workflow }}-${{ github.ref }}
4+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
55
cancel-in-progress: true
66

77
on:
@@ -24,7 +24,7 @@ jobs:
2424
- name: install dependencies
2525
run: |
2626
sudo apt-get install ninja-build
27-
pip3 install conan==1.52.0
27+
pip3 install conan==1.54.0
2828
pip3 install gcovr
2929
3030
- name: Conan common config
@@ -70,7 +70,7 @@ jobs:
7070
- name: install dependencies
7171
run: |
7272
sudo apt-get install valgrind ninja-build
73-
pip3 install conan==1.52.0
73+
pip3 install conan==1.54.0
7474
7575
- name: Conan common config
7676
run: |
@@ -105,7 +105,7 @@ jobs:
105105
- name: install dependencies
106106
run: |
107107
sudo apt-get install ninja-build
108-
pip3 install conan==1.52.0
108+
pip3 install conan==1.54.0
109109
110110
- name: Conan common config
111111
run: |
@@ -139,7 +139,7 @@ jobs:
139139
- name: install dependencies
140140
run: |
141141
sudo apt-get install valgrind doxygen graphviz gettext ninja-build
142-
pip3 install conan==1.52.0
142+
pip3 install conan==1.54.0
143143
144144
- name: Conan common config
145145
run: |

‎.github/workflows/on_PR_linux_staticAnalysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: On PRs - Linux - Static Analysis
22

33
concurrency:
4-
group: ${{ github.workflow }}-${{ github.ref }}
4+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
55
cancel-in-progress: true
66

77
on:
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: install dependencies
2525
run: |
26-
pip3 install conan==1.52.0
26+
pip3 install conan==1.54.0
2727
sudo add-apt-repository ppa:ubuntu-lxc/daily -y
2828
wget -q -O - https://files.pvs-studio.com/etc/pubkey.txt |sudo apt-key add -
2929
sudo wget -O /etc/apt/sources.list.d/viva64.list https://files.pvs-studio.com/etc/viva64.list

‎.github/workflows/on_PR_mac_matrix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: On PRs - Mac Matrix
22

33
concurrency:
4-
group: ${{ github.workflow }}-${{ github.ref }}
4+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
55
cancel-in-progress: true
66

77
on:

‎.github/workflows/on_PR_mac_special_builds.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: On PRs - Mac Special Builds
22

33
concurrency:
4-
group: ${{ github.workflow }}-${{ github.ref }}
4+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
55
cancel-in-progress: true
66

77
on:

‎.github/workflows/on_PR_windows_matrix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: On PRs - Windows Matrix
22

33
concurrency:
4-
group: ${{ github.workflow }}-${{ github.ref }}
4+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
55
cancel-in-progress: true
66

77
on:
@@ -54,7 +54,7 @@ jobs:
5454

5555
- name: Install Conan & Common config
5656
run: |
57-
pip.exe install "conan==1.52.0"
57+
pip.exe install "conan==1.54.0"
5858
conan config install https://github.com/conan-io/conanclientcert.git
5959
conan profile new --detect default
6060
conan profile update settings.build_type=${{matrix.build_type}} default

0 commit comments

Comments
 (0)