Skip to content
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

Release 3.12.1.0 version bumps #10130

Merged
merged 2 commits into from
Jun 21, 2024
Merged

Release 3.12.1.0 version bumps #10130

merged 2 commits into from
Jun 21, 2024

Conversation

geekosaur
Copy link
Collaborator

The original branch name collides with a branch protection rule, making it difficult to work with.
This is C.3.1/2 in the wiki.
See #9885.

@ulysses4ever
Copy link
Collaborator

As an experiment, I'd try to change:

setup-depends: Cabal == 3.10.*,
Cabal-syntax == 3.10.*,

to say 3.12 instead of 3.10.

@geekosaur
Copy link
Collaborator Author

Yeh, I changed it back and it worked locally, so I tried to push it up and discovered that I'd misnamed my local branch and branch protections were applying on github's side. So I killed the branch and started over.

@geekosaur geekosaur force-pushed the version-bumps-3.12.1.0 branch from 06145ea to 68213c7 Compare June 21, 2024 08:00
@geekosaur
Copy link
Collaborator Author

Unrequested reviews until I finish with bootstrap plans.

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, thank you!

@geekosaur
Copy link
Collaborator Author

I'm not actually sure it's ready though. We don't have a 9.10.1 bootstrap, and I'm still suspicious that hackage-security isn't actually using the correct Cabal/Cabal-syntax.

@geekosaur
Copy link
Collaborator Author

Right, I just tried to add a 9.10.1 bootstrap and ran into one of the known upstream issues (TH version) which I think is fixed in git but not yet released.

@geekosaur geekosaur added squash+merge me Tell Mergify Bot to squash-merge and removed attention: needs-review squash+merge me Tell Mergify Bot to squash-merge labels Jun 21, 2024
@geekosaur
Copy link
Collaborator Author

Sorry, wrong ticket

@geekosaur
Copy link
Collaborator Author

@geekosaur geekosaur added the squash+merge me Tell Mergify Bot to squash-merge label Jun 21, 2024
@geekosaur
Copy link
Collaborator Author

I'll hold onto the changes for 9.10.1 bootstrap and apply them to master when hackage-security is ready.

@geekosaur
Copy link
Collaborator Author

Manual squash+merge because Mergify on 3.12 has neither squash+merge me nor rules for non-backports on non-master branches. I'll fix both post-release.

@geekosaur geekosaur merged commit 3d6753e into 3.12 Jun 21, 2024
53 checks passed
@geekosaur geekosaur deleted the version-bumps-3.12.1.0 branch June 21, 2024 22:07
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jun 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days release squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants