Skip to content

bump versions (master) #11022

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
Jun 29, 2025
Merged

bump versions (master) #11022

merged 1 commit into from
Jun 29, 2025

Conversation

geekosaur
Copy link
Collaborator

@geekosaur geekosaur commented Jun 25, 2025 •
edited
Loading

Don't merge this until after the 3.16 branch is cut: it needs different version bumps. It also needs the hackage-security revision to go in and the index state re-pinned.

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

Depends-on: #11024

@geekosaur geekosaur mentioned this pull request Jun 25, 2025
Open
34 tasks
ulysses4ever
ulysses4ever approved these changes Jun 25, 2025
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.

I don't see why it'd be bad to merge this independently (no matter before or after) the 3.16 cut.

Mikolaj
Mikolaj approved these changes Jun 25, 2025
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.

LGTM

@geekosaur geekosaur force-pushed the r3.16-B.1.6a-package-versions branch 2 times, most recently from 79303af to 9e64bfd Compare June 25, 2025 23:47
@geekosaur
Copy link
Collaborator Author

geekosaur commented Jun 26, 2025 •
edited
Loading

Who did the symbolic paths change to Cabal? You missed the custom-setup in cabal-testsuite. (More correctly, it couldn't be done then because we had to run that against 3.12.1.0; it is only now being run against 3.14.1.1.) See https://github.com/haskell/cabal/actions/runs/15889545297/job/44809267322?pr=11022#step:10:520 for details.

/cc: @sheaf

@geekosaur geekosaur force-pushed the r3.16-B.1.6a-package-versions branch from 9e64bfd to fc03e72 Compare June 26, 2025 00:53
@geekosaur
Copy link
Collaborator Author

For the time being, since it only involves the test suite's custom setup, I've reverted that and the matching validate.yml dependency to 3.12.1.0.

@geekosaur
Copy link
Collaborator Author

geekosaur commented Jun 26, 2025 •
edited
Loading

Wait, we should be getting the new hackage-security at this point?

ETA: missing from release wiki page: need to regenerate jsons after the new hackage-security is released, or it'll bootstrap using the old version

@geekosaur geekosaur force-pushed the r3.16-B.1.6a-package-versions branch from fc03e72 to 5110f15 Compare June 26, 2025 01:56
@geekosaur geekosaur added the merge me Tell Mergify Bot to merge label Jun 26, 2025
@mergify mergify bot added the ready and waiting Mergify is waiting out the cooldown period label Jun 26, 2025
@geekosaur geekosaur removed merge me Tell Mergify Bot to merge ready and waiting Mergify is waiting out the cooldown period labels Jun 26, 2025
@geekosaur
Copy link
Collaborator Author

Forgot I need to move the splitmix constraint to the right place so all the project files get it, not just the one needed for validate to work. Probably need to regenerate the jsons again since I think we make one for Macs too?

@ulysses4ever
Copy link
Collaborator

I see only linux jsons.

@geekosaur geekosaur force-pushed the r3.16-B.1.6a-package-versions branch 2 times, most recently from 5134afd to c83de47 Compare June 26, 2025 15:42
@geekosaur
Copy link
Collaborator Author

But we nevertheless have a macos bootstrap job. I guess it uses one of the Linux jsons?

@geekosaur
Copy link
Collaborator Author

geekosaur commented Jun 26, 2025 •
edited
Loading

Did I do it wrong? Now bootstrap is trying to download buildinfo-reference-generator-0, which I'm pretty sure is internal?

ETA: and indeed the new jsons reference it, but the old ones didn't. Anyone know what's going on here?

ETA: regenerating them again got rid of it. No clue…
Nope, I made a dumb git mistake, it's still happening on this branch for some reason.
Okay, I pulled in one too many imports to cabal.bootstrap.project. Fixed now.

@geekosaur geekosaur force-pushed the r3.16-B.1.6a-package-versions branch from c83de47 to 20433de Compare June 26, 2025 16:18
@geekosaur geekosaur added merge me Tell Mergify Bot to merge ready and waiting Mergify is waiting out the cooldown period labels Jun 26, 2025
@geekosaur geekosaur force-pushed the r3.16-B.1.6a-package-versions branch 3 times, most recently from e71b697 to b523519 Compare June 27, 2025 22:43
@geekosaur
bump versions (master)
e01349d 
also update bootstraps for new hackage-security, and move splitmix
constraint to where it will work for more than just validate

also updated bootstrap to use ghc 9.10.2, which was missed earlier?
@geekosaur geekosaur force-pushed the r3.16-B.1.6a-package-versions branch from b523519 to e01349d Compare June 27, 2025 23:42
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jun 29, 2025
@mergify mergify bot merged commit d8c21ab into haskell:master Jun 29, 2025
54 checks passed
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
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
Milestone
No milestone
Development

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