Skip to content

Commit 2b74841

Browse files
authored
Separate workflow reusable-call runs from standalone runs (#2443)
## Changes Fix concurrency collisions between scheduled and push-triggered workflows Previously, workflows such as `packchk`, `packgen`, and `projmgr ` etc used a concurrency group based only on `${{ github.workflow }}-${{ github.ref }}`. This caused runs triggered by different events (e.g. nightly schedule vs. push to main) to share the same concurrency group and cancel each other when `cancel-in-progress: true` was set. As a result, a scheduled `nightly `run could be unexpectedly cancelled by a push-triggered run. For e.g. https://github.com/Open-CMSIS-Pack/devtools/actions/runs/24540773684/attempts/1 This change updates the concurrency group to include `${{ github.event_name }}`, ensuring that runs triggered by different event types are isolated: `${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}` ## Checklist <!-- Put an `x` in the boxes. All tasks must be completed and boxes checked before merging. --> - [x] 🤖 This change is covered by unit tests (if applicable). - [x] 🤹 Manual testing has been performed (if necessary). - [x] 🛡️ Security impacts have been considered (if relevant). - [x] 📖 Documentation updates are complete (if required). - [x] 🧠 Third-party dependencies and TPIP updated (if required).
1 parent c2e5f7d commit 2b74841

9 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/buildmgr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ on:
3232
types: [ published ]
3333

3434
concurrency:
35-
group: ${{ github.workflow }}-${{ github.ref }}
35+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
3636
cancel-in-progress: true
3737

3838
permissions:
@@ -118,7 +118,7 @@ jobs:
118118
(github.event_name == 'release' && startsWith(github.ref, 'refs/tags/tools/buildmgr/')) ||
119119
((github.event.schedule != '') && (!github.event.repository.private))
120120
runs-on: ubuntu-22.04
121-
timeout-minutes: 5
121+
timeout-minutes: 15
122122
permissions:
123123
contents: write
124124
steps:

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
branches: [ main ]
1717

1818
concurrency:
19-
group: ${{ github.workflow }}-${{ github.ref }}
19+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
2020
cancel-in-progress: true
2121

2222
permissions:

.github/workflows/cpp-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
- '!**/*.md'
1717

1818
concurrency:
19-
group: ${{ github.workflow }}-${{ github.ref }}
19+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
2020
cancel-in-progress: true
2121

2222
env:

.github/workflows/markdown.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- '**/*.md'
99

1010
concurrency:
11-
group: ${{ github.workflow }}-${{ github.ref }}
11+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
1212
cancel-in-progress: true
1313

1414
permissions:

.github/workflows/packchk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ on:
3737
types: [published]
3838

3939
concurrency:
40-
group: ${{ github.workflow }}-${{ github.ref }}
40+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
4141
cancel-in-progress: true
4242

4343
permissions:

.github/workflows/packgen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ on:
3232
types: [published]
3333

3434
concurrency:
35-
group: ${{ github.workflow }}-${{ github.ref }}
35+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
3636
cancel-in-progress: true
3737

3838
permissions:

.github/workflows/projmgr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ on:
3636
types: [published]
3737

3838
concurrency:
39-
group: ${{ github.workflow }}-${{ github.ref }}
39+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
4040
cancel-in-progress: true
4141

4242
permissions:

.github/workflows/svdconv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929
types: [published]
3030

3131
concurrency:
32-
group: ${{ github.workflow }}-${{ github.ref }}
32+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
3333
cancel-in-progress: true
3434

3535
permissions:

.github/workflows/test_libs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
- 'test/**'
2222

2323
concurrency:
24-
group: ${{ github.workflow }}-${{ github.ref }}
24+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
2525
cancel-in-progress: true
2626

2727
permissions:

0 commit comments

Comments
 (0)