-
Notifications
You must be signed in to change notification settings - Fork 697
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.
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
Bump project version from 3.11 to 3.13 #9897
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks okay to me, but CI thinks we're still depending on 3.11 somewhere.
ETA: correction, cabal-install is of course still 3.11 for this, but it's using Cabal-syntax 3.10.1.0 for some reason.
Yeah there's still some work to do, I don't know how these bumps were done in the past. |
And it's also described in https://github.com/haskell/cabal/wiki/Making-a-release#c3-bumping-version-numbers |
cd2c554
to
d977b87
Compare
I've updated the bootstrap plans and added a few missing version bumps. Let's see how far we get now. |
d8a4a31
to
f81b46a
Compare
BTW, since this ticket was opened, the release checklist has changed and now also these steps need to be done on branch master (unless done already; probably a half is): #9729 Edit: but it doesn't need to be in this ticket. They are only vaguely related. Edit2: Actually, now that these steps are separated, |
dc0e4af
to
f32497e
Compare
This is a part of the release process, so let's fast-track, unless anybody needs more time to review (I will now). |
@mergify rebase |
✅ Branch has been successfully rebased |
f32497e
to
88737ef
Compare
tests: False | ||
benchmarks: False | ||
|
||
index-state: hackage.haskell.org 2024-04-22T06:16:57Z |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Proliferation of index-states
is concerning. Ideally, it'd be done with import
's.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think #9901 makes that difficult currently.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I haven't put enough thought into possible workarounds. I guess, this PR should be merged asap, and we can think about it more, later.
, Cabal ^>=3.4.1.0 || ^>=3.6.3.0 || ^>=3.10.1.0 || ^>=3.12.1.0 | ||
, Cabal-syntax ^>=3.8.1.0 || ^>=3.10.1.0 || ^>=3.12.1.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The first release from these series will be exceptionally 3.12.0.0, but it's indeed unlikely anybody is bootstrapping until cabal-install is released in 3.12.1.0.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you very much!
tests: False | ||
benchmarks: False | ||
|
||
index-state: hackage.haskell.org 2024-04-22T06:16:57Z |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sigh. I will report about this duplicated index state and the breakage that necessitated this new file in #9901
I forgot it now merges after only a few jobs pass for an uknown reason. I will monitor that the rebased CI finishes. |
Interestingly, there is nothing about this in the Mergify rulebase, so it's presumably a code change in Mergify. I wish I'd been able to find documentation on mergify.com, but it seems to all be marketing information. |
I suspect it's related to branch protection rules in Settings, but they do look fine as well. |
I missed when this problem appeared. I am reasonably sure that it's due to #9355. After it, Validate post job always "succeeds" instantaneously and can fail later on on the real runs, if there are any, but Mergify won't wait and once it sees "success" there, it merges right away. /cc @BinderDavid |
@geekosaur: I've bumped your repo permissions to Maintain. I wonder if you can see the Settings tab now. |
How is https://docs.mergify.com/? |
Should we open a separate issue for this? I fail to see who exactly is responsible here: mergify or the github branch protection rules. https://docs.mergify.com/workflow/actions/merge/ for example is quite unclear and vague:
but also
When I implemented the logic for the faster documentation CI I focused on getting the code correct for the branch protection logic that Github uses. I thought that mergify only provides additional convenience features on top of Github's rules, and that it can't override something that Github branch protection forbids, but now I am not so sure anymore. Edit: I now recall that https://github.com/orgs/community/discussions/13690 is the relevant thread that describes the annoying Github restriction which made the workaround necessary in the first place. |
@BinderDavid thanks for a prompt response! I think no one, including the approvers of your PR, could have anticipated this interaction between GH and Mergify (assuming this is the real reason of the problem, which is not a given). Indeed, opening a separate ticket would be good. |
This PR bumps the Cabal version from 3.11 to 3.13, as the release branch for 3.12 has already been cut.