From 9a61747210656c5423683d6f8a1e5463af2a2daa Mon Sep 17 00:00:00 2001 From: Joris Dral Date: Thu, 28 Aug 2025 17:30:02 +0200 Subject: [PATCH] Add a merge queue trigger --- fixtures/all-versions.github | 1 + fixtures/conditionals.github | 1 + fixtures/copy-fields-all.github | 1 + fixtures/copy-fields-none.github | 1 + fixtures/copy-fields-some.github | 1 + fixtures/doctest-version.github | 1 + fixtures/doctest.github | 1 + fixtures/empty-line.github | 1 + fixtures/enabled-jobs.github | 1 + fixtures/fail-versions.github | 1 + fixtures/irc-channels.github | 1 + fixtures/messy.github | 1 + fixtures/psql.github | 1 + fixtures/travis-patch.github | 1 + src/HaskellCI/GitHub/Yaml.hs | 3 ++- 15 files changed, 16 insertions(+), 1 deletion(-) diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github index 1bd9da51..54dea125 100644 --- 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 index 04125f0e..a02e178b 100644 --- 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 index 6e03e706..ee4a1bbc 100644 --- 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 index da590a0d..5cd948bb 100644 --- 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 index e0122c94..f68274e7 100644 --- 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 index e57ca1a4..b601f738 100644 --- 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 index 9d4645f0..5e13b059 100644 --- 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 index a5ef2989..44142edc 100644 --- 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 index 320811d6..af77461a 100644 --- 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 index f549cbfc..d3d1a73d 100644 --- 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 index c8091709..e37e4707 100644 --- 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 index 1d82d571..d58b5660 100644 --- 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 index 7ff71b44..4faccdfd 100644 --- 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 index f8623449..b71a9e9b 100644 --- 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/src/HaskellCI/GitHub/Yaml.hs b/src/HaskellCI/GitHub/Yaml.hs index adb4a145..000b715f 100644 --- 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 []