Skip to content

Commit 74f3769

Browse files
authored
chore: add merge_group to CI workflow (#813)
Related to #812.
1 parent 9ff3554 commit 74f3769

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ name: Continuous Integration
99
pull_request:
1010
branches:
1111
- main
12+
merge_group: {}
1213
schedule:
1314
- cron: 14 11 * * *
1415
concurrency:

tools/generate_ci_workflow/internal/github/workflow.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ func NewWorkflowFromYAML(b []byte) (*Workflow, error) {
2828
// WorkflowTriggers represents the triggers for a workflow.
2929
type WorkflowTriggers struct {
3030
PullRequest PullRequestEvent `yaml:"pull_request"`
31+
MergeGroup MergeGroup `yaml:"merge_group"`
3132
Schedule []Schedule `yaml:"schedule,omitempty"`
3233
}
3334

@@ -36,6 +37,8 @@ type PullRequestEvent struct {
3637
Branches []string `yaml:"branches,omitempty"`
3738
}
3839

40+
type MergeGroup struct{}
41+
3942
// Schedule is the cron schedule for a workflow.
4043
type Schedule struct {
4144
Cron string `yaml:"cron"`

tools/generate_ci_workflow/internal/github/workflow_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ name: Continuous Integration
8989
on:
9090
pull_request:
9191
branches: [ main ]
92+
merge_group:
9293
schedule:
9394
# Every day at 11:14 UTC.
9495
- cron: '14 11 * * *'

0 commit comments

Comments
 (0)