Add a merge queue trigger

jorisdral · phadej · commit 50436ab990c7 · 2025-09-17T13:56:34.000+03:00
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -18,6 +18,9 @@ on:
   pull_request:
     branches:
       - master
+  merge_group:
+    branches:
+      - master
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/conditionals.github b/fixtures/conditionals.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/copy-fields-all.github b/fixtures/copy-fields-all.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/copy-fields-none.github b/fixtures/copy-fields-none.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/copy-fields-some.github b/fixtures/copy-fields-some.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/doctest-version.github b/fixtures/doctest-version.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/doctest.github b/fixtures/doctest.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/empty-line.github b/fixtures/empty-line.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/enabled-jobs.github b/fixtures/enabled-jobs.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/fail-versions.github b/fixtures/fail-versions.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/irc-channels.github b/fixtures/irc-channels.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   irc:
     name: Haskell-CI (IRC notification)
diff --git a/fixtures/messy.github b/fixtures/messy.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/psql.github b/fixtures/psql.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/fixtures/travis-patch.github b/fixtures/travis-patch.github
@@ -16,6 +16,7 @@ name: Haskell-CI
 on:
   - push
   - pull_request
+  - merge_group
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
diff --git a/haskell-ci.cabal b/haskell-ci.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.2
 name:               haskell-ci
-version:            0.19.20250916
+version:            0.19.20250917
 synopsis:           Haskell CI script generator
 description:
   Script generator (@haskell-ci@) for
diff --git a/src/HaskellCI/GitHub/Yaml.hs b/src/HaskellCI/GitHub/Yaml.hs
@@ -96,11 +96,12 @@ instance ToYaml GitHub where
 instance ToYaml GitHubOn where
     toYaml GitHubOn {..}
         | null ghBranches
-        = ylistFilt [] ["push", "pull_request"]
+        = ylistFilt [] ["push", "pull_request", "merge_group"]
         | otherwise
         = ykeyValuesFilt []
               [ "push"         ~> branches
               , "pull_request" ~> branches
+              , "merge_group"  ~> branches
               ]
       where
         branches = ykeyValuesFilt []
