Merge pull request #1078 from NordSecurity/jj_merge_queue

Enable merge queue in our workflows
NordSecurity · Jan 27, 2025 · 3d8bc7e · 3d8bc7e
2 parents 80a1f1e + 36a680f
commit 3d8bc7e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,11 +1,17 @@
 name: CI
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  merge_group:
+    types: [checks_requested]
+
 permissions: {}
 
 jobs:
   trigger:
     if: |
       github.event_name == 'push' ||
+      github.event_name == 'merge_group' ||
       (
         github.event_name == 'pull_request' &&
         github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name

diff --git a/.github/workflows/gitlab.yml b/.github/workflows/gitlab.yml
@@ -3,6 +3,8 @@ on:
   pull_request_target:
     types: [labeled]
   push:
+  merge_group:
+    types: [checks_requested]
   schedule:
     # Avoid running on 0 since a lot of other workflows on github start at that
     # time and this can cause delays or even dropping of jobs:

diff --git a/.unreleased/merge_queue b/.unreleased/merge_queue