Skip to content

Conversation

@geekosaur
Copy link
Collaborator

validated on 3.12 branch and applied in backport of #10448; this brings the fixes up to master

Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

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). actually taken from a backport!

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.

Looks plausible...

@geekosaur
Copy link
Collaborator Author

It led to the first actual success of the check on 3.12 branch where it originated (as a fixup to #10477), so I'm fairly confident that it's now working properly.

@geekosaur
Copy link
Collaborator Author

geekosaur commented Oct 26, 2024

Not needed for 3.14 release, but we probably want it in the tree before we make any later 3.14 releases so we can verify that they don't break compatibility with the bundled Cabal in 9.12.1. Note that the backport will need Depends-on: #10477.

@Kleidukos
Copy link
Member

Kleidukos commented Nov 15, 2024

@geekosaur I believe this can go in. I'll start the process of producing the binaries after it's merged.

@geekosaur
Copy link
Collaborator Author

geekosaur commented Nov 15, 2024

There's no reason it can't, it just won't do anything until post-release and even then it'll only affect CI, so I don't see much point to it slowing the release.

@geekosaur geekosaur added merge me Tell Mergify Bot to merge and removed attention: needs-review labels Dec 16, 2024
@mergify mergify bot added ready and waiting Mergify is waiting out the cooldown period merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days labels Dec 16, 2024
validated on 3.12 branch and applied in backport of haskell#10448; this
brings the fixes up to `master`
@mergify mergify bot merged commit 0025961 into haskell:master Dec 18, 2024
49 checks passed
@geekosaur
Copy link
Collaborator Author

@mergify backport 3.14

@mergify
Copy link
Contributor

mergify bot commented Dec 18, 2024

backport 3.14

✅ Backports have been created

mergify bot added a commit that referenced this pull request Dec 19, 2024
@geekosaur
Copy link
Collaborator Author

@mergify backport 3.14.1.1

@mergify
Copy link
Contributor

mergify bot commented Dec 26, 2024

backport 3.14.1.1

✅ Backports have been created

@geekosaur
Copy link
Collaborator Author

turns out we need it because I added the branch protection rule… after the release. which wouldn't have been a problem except for this emergency release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

continuous-integration merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge ready and waiting Mergify is waiting out the cooldown period

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants