Skip to content

Commit 109424d

Browse files
authored
[CI] Do not cancel builds in merge queue (#249)
1 parent 0fea904 commit 109424d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
13-
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
13+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.event_name != 'merge_group' && !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
1414

1515
jobs:
1616
clang-format:

.github/workflows/static-analysis-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [pull_request]
44

55
concurrency:
66
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
7-
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
7+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.event_name != 'merge_group' && !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
88

99
jobs:
1010
clang-tidy:

0 commit comments

Comments
 (0)