Skip to content

Conversation

@geekosaur
Copy link
Collaborator

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).

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.

There are a few more changes in https://github.com/haskell/cabal/pull/11037/files (though I agree tweaking the boostrap files by hand is not likely to help).

@geekosaur
Copy link
Collaborator Author

Bootstrap is actually a problem: until 9.14.1 is actually released, we can't add it to the bootstrap versions. (A prerelease won't work for this, AIUI.)

@ulysses4ever
Copy link
Collaborator

hot take: bootstrap isn't related to release directly and can be updated anytime afterwards? I'm not sure how people use it. Of course, someone can try to check out the 3.16.1.0 tag and bootstrap from there. But there's a general problem: I clearly remember us deciding that we only support bootstraping from the version on the master branch (we had to burn some bridges in the past, so that we don't have to maintain working bootstrapping across several branches, which is too much work).

@geekosaur
Copy link
Collaborator Author

Now that you mention that, I recall that as well. So we can skip that part.

@geekosaur
Copy link
Collaborator Author

Right, so bootstrap isn't applicable here and I think neither are the internal packages (bump with major version yes, with minors no; possibly solver-benchmarks.cabal). So this should be ready to go as is.

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.

Thanks! Just one question.

@geekosaur
Copy link
Collaborator Author

Actually, if we don't support bootstrapping from release branches anyway, it shouldn't be relevant. (If we did, and those bounds affected the bounds cabal-bootstrap-gen writes out for cabal-install, it would be very relevant.) That said, Nix folks in particular I would not expect to use bootstrapping.

@geekosaur
Copy link
Collaborator Author

Oh, right, looking at this again I did it because it was done for 3.14.1.0 as well.

@geekosaur geekosaur added merge me Tell Mergify Bot to merge and removed attention: needs-review labels Nov 26, 2025
@geekosaur
Copy link
Collaborator Author

@Mergifyio queue

@mergify
Copy link
Contributor

mergify bot commented Nov 26, 2025

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 06b79de

@mergify
Copy link
Contributor

mergify bot commented Nov 26, 2025

Merge Queue Status Beta

✅ The pull request has been merged

This pull request spent 10 minutes 5 seconds in the queue, with no time waiting for CI.
The checks were run in-place.

Required conditions to merge
  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
  • any of [🛡 GitHub branch protection]:
    • check-success = Doctest Cabal
    • check-neutral = Doctest Cabal
    • check-skipped = Doctest Cabal
  • any of [🛡 GitHub branch protection]:
    • check-success = Meta checks
    • check-neutral = Meta checks
    • check-skipped = Meta checks
  • any of [🛡 GitHub branch protection]:
    • check-success = Validate post job
    • check-neutral = Validate post job
    • check-skipped = Validate post job
  • any of [🛡 GitHub branch protection]:
    • check-success = docs/readthedocs.org:cabal
    • check-neutral = docs/readthedocs.org:cabal
    • check-skipped = docs/readthedocs.org:cabal
  • any of [🛡 GitHub branch protection]:
    • check-success = Bootstrap post job
    • check-neutral = Bootstrap post job
    • check-skipped = Bootstrap post job
  • any of [🛡 GitHub branch protection]:
    • check-success = whitespace
    • check-neutral = whitespace
    • check-skipped = whitespace

@mergify mergify bot added the queued label Nov 26, 2025
@geekosaur
Copy link
Collaborator Author

I don't know why it didn't act on the label; it looks like all conditions match….

@mergify mergify bot merged commit 06b79de into 3.16 Nov 26, 2025
58 checks passed
@mergify mergify bot deleted the r3.16-C.3.1-bump-versions branch November 26, 2025 05:04
@mergify mergify bot removed the queued label Nov 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge me Tell Mergify Bot to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants