Skip to content

Commit cc97375

Browse files
authored
feat: enable GitHub merge queues (#1849)
1 parent 0a7580b commit cc97375

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/workflows/check-shellscripts.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
name: Check shell scripts
22

33
on:
4-
push:
5-
branches:
6-
- develop
74
pull_request:
5+
merge_group:
86
workflow_dispatch:
97

108
concurrency:
11-
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
12-
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
9+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_ref || github.ref }}
10+
cancel-in-progress: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
1311

1412
permissions:
1513
contents: read

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Check merge requirements
22

33
on:
44
pull_request:
5+
merge_group:
56

67
permissions:
78
contents: read

.github/workflows/nix-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Nix CI
33
on:
44
push:
55
branches:
6-
- develop
76
- release/*
87
pull_request:
8+
merge_group:
99
workflow_dispatch:
1010

1111
permissions:

0 commit comments

Comments
 (0)