chore: add merge_group to CI workflow (#813)

Related to #812.
cgrindel · Dec 17, 2023 · 74f3769 · 74f3769
1 parent 9ff3554
commit 74f3769
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,6 +9,7 @@ name: Continuous Integration
   pull_request:
     branches:
       - main
+  merge_group: {}
   schedule:
     - cron: 14 11 * * *
 concurrency:

diff --git a/tools/generate_ci_workflow/internal/github/workflow.go b/tools/generate_ci_workflow/internal/github/workflow.go
@@ -28,6 +28,7 @@ func NewWorkflowFromYAML(b []byte) (*Workflow, error) {
 // WorkflowTriggers represents the triggers for a workflow.
 type WorkflowTriggers struct {
 	PullRequest PullRequestEvent `yaml:"pull_request"`
+	MergeGroup  MergeGroup       `yaml:"merge_group"`
 	Schedule    []Schedule       `yaml:"schedule,omitempty"`
 }
 
@@ -36,6 +37,8 @@ type PullRequestEvent struct {
 	Branches []string `yaml:"branches,omitempty"`
 }
 
+type MergeGroup struct{}
+
 // Schedule is the cron schedule for a workflow.
 type Schedule struct {
 	Cron string `yaml:"cron"`

diff --git a/tools/generate_ci_workflow/internal/github/workflow_test.go b/tools/generate_ci_workflow/internal/github/workflow_test.go
@@ -89,6 +89,7 @@ name: Continuous Integration
 on:
   pull_request:
     branches: [ main ]
+  merge_group:
   schedule:
     # Every day at 11:14 UTC.
     - cron: '14 11 * * *'