supporting merge queues in CI workflows

Signed-off-by: Jordan Keister <[email protected]>
grokspawn · Feb 22, 2024 · 9b503ed · 9b503ed
1 parent efddcb3
commit 9b503ed
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 0 deletions.
diff --git a/.github/workflows/go-apidiff.yaml b/.github/workflows/go-apidiff.yaml
@@ -8,6 +8,7 @@ on:
     paths:
       - '**'
       - '!doc/**'
+  merge_group:
 
 jobs:
   go-apidiff:

diff --git a/.github/workflows/goreleaser.yaml b/.github/workflows/goreleaser.yaml
@@ -6,6 +6,7 @@ on:
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
   pull_request: {}
+  merge_group:
 defaults:
   run:
     shell: bash

diff --git a/.github/workflows/sanity.yaml b/.github/workflows/sanity.yaml
@@ -8,6 +8,7 @@ on:
     paths:
       - '**'
       - '!doc/**'
+  merge_group:
 
 jobs:
   sanity:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,6 +7,8 @@ on:
     paths:
       - '**'
       - '!doc/**'
+  merge_group:
+
 jobs:
   e2e:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
@@ -8,6 +8,7 @@ on:
     paths:
       - '**'
       - '!doc/**'
+  merge_group:
 
 jobs:
   unit:
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ on: @@
         paths:
           - '**'
           - '!doc/**'
+      merge_group:
     jobs:
       go-apidiff:
@@ Expand Down @@