Skip to content

Add a merge queue trigger #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Add a merge queue trigger #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions fixtures/all-versions.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
1 change: 1 addition & 0 deletions fixtures/conditionals.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
1 change: 1 addition & 0 deletions fixtures/copy-fields-all.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
1 change: 1 addition & 0 deletions fixtures/copy-fields-none.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
1 change: 1 addition & 0 deletions fixtures/copy-fields-some.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
1 change: 1 addition & 0 deletions fixtures/doctest-version.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
1 change: 1 addition & 0 deletions fixtures/doctest.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
1 change: 1 addition & 0 deletions fixtures/empty-line.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
1 change: 1 addition & 0 deletions fixtures/enabled-jobs.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
1 change: 1 addition & 0 deletions fixtures/fail-versions.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
1 change: 1 addition & 0 deletions fixtures/irc-channels.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
irc:
name: Haskell-CI (IRC notification)
Expand Down
1 change: 1 addition & 0 deletions fixtures/messy.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
1 change: 1 addition & 0 deletions fixtures/psql.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
1 change: 1 addition & 0 deletions fixtures/travis-patch.github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ name: Haskell-CI
on:
- push
- pull_request
- merge_group
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand Down
3 changes: 2 additions & 1 deletion src/HaskellCI/GitHub/Yaml.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
]
Copy link
Collaborator

@phadej phadej Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do just

    toYaml GitHubOn {..}
        | null ghBranches
        = ylistFilt [] ["push", "pull_request","merge_queue"]
        | otherwise
        = ykeyValuesFilt []
              [ "push"         ~> branches
              , "pull_request" ~> branches
              , "merge_queue"  ~> branches
              ]

I don't see a reason to not simply always enable merge_queue.

And I especially don't like that merge_queue with branches doesn't configure branches.

Copy link
Contributor Author

@jorisdral jorisdral Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, that's a simpler change. I was under the impression that the merge_group trigger had no branches filter, since it's not documented anywhere

Copy link
Collaborator

@phadej phadej Aug 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's unclear. The GHA YAML doesn't have proper schema, and the documentation is sparse and spread out. The docs are bad.

Copy link
Contributor Author

@jorisdral jorisdral Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to work fine with the branches filter on well-typed/hs-bindgen#1025

Copy link
Contributor Author

@jorisdral jorisdral Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, I've updated the PR

where
branches = ykeyValuesFilt []
Expand Down
Loading