Skip to content

add squash+merge for backports #9879

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

Jump to bottom
Merged
merged 1 commit into from
Apr 18, 2024
Merged

add squash+merge for backports #9879

merged 1 commit into from
Apr 18, 2024

Conversation

geekosaur
Copy link
Collaborator

@geekosaur geekosaur commented Apr 9, 2024 •
edited
Loading

Made by copying things from the master squash+merge into a copy of the backport strategy. I'm a neophyte at Mergify, so someone should check this.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

Testing notes:

  • since this affects only CI of backports, there's no way to test on master
  • I disrecommend testing on actual release branches. I suspect we need to create a test branch to "backport" things to.

@geekosaur geekosaur force-pushed the wip/geekosaur/ci-backport-squash branch from 41b9fa0 to ffdb936 Compare April 9, 2024 22:31
@geekosaur geekosaur marked this pull request as draft April 10, 2024 02:42
Mikolaj
Mikolaj approved these changes Apr 10, 2024
View reviewed changes
Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

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

Looks plausible.

@geekosaur geekosaur marked this pull request as ready for review April 10, 2024 16:16
ulysses4ever
ulysses4ever approved these changes Apr 13, 2024
View reviewed changes
Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@Mikolaj Mikolaj added the merge me Tell Mergify Bot to merge label Apr 16, 2024
@Mikolaj
Copy link
Member

Mikolaj commented Apr 16, 2024

I took the liberty of adding the label.

@geekosaur
Copy link
Collaborator Author

Hrm, I was expecting some actual testing by making a dummy branch to backport things to.

@geekosaur geekosaur mentioned this pull request Apr 16, 2024
Merged
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Apr 18, 2024
@Mikolaj Mikolaj force-pushed the wip/geekosaur/ci-backport-squash branch from ffdb936 to 45b9f0b Compare April 18, 2024 09:11
@mergify mergify bot merged commit e1e27de into haskell:master Apr 18, 2024
@geekosaur geekosaur mentioned this pull request Jun 22, 2024
Merged
@geekosaur geekosaur deleted the wip/geekosaur/ci-backport-squash branch September 3, 2024 10:55
@jasagredo jasagredo removed the attention: needs-manual-qa PR is destined for manual QA label Sep 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mikolaj Mikolaj Mikolaj approved these changes

@ulysses4ever ulysses4ever ulysses4ever approved these changes

Assignees
No one assigned
Labels
attention: needs-backport 3.10 merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge
Projects
Manual QA board
Status: To Test
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@geekosaur @Mikolaj @ulysses4ever @jasagredo