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

regenerate bootstrap files without arch-native #10148

Merged
merged 1 commit into from
Jun 24, 2024
Merged

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

@geekosaur
Copy link
Collaborator Author

@mergify backport master

Copy link
Contributor

mergify bot commented Jun 24, 2024

backport master

✅ Backports have been created

@TerrorJack
Copy link
Collaborator

Would automatic forward port work properly for master? Since master additionally contains 8.10.7 plan which doesn't seem to be in 3.12 branch

@geekosaur
Copy link
Collaborator Author

I think it's officially no longer supported for bootstrapping? Not sure how it's still on master; we've had some glitches due to conflicting changes to bootstrap-related things. @Mikolaj / @ulysses4ever ?

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.

I think it's fine to just delete the old bootstrap on master as a manual additional change to the forward port. We may have removed the old bootstrap with @ffaf1 (did we?) when releasing 3.12.0.0 in order to conserve our sanity. A couple of GHC versions is enough for bootstrapping (and we can generate more if users need them and tell us), so this old one can go.

@geekosaur
Copy link
Collaborator Author

geekosaur commented Jun 24, 2024

Reminder, since the Mergify rules update hasn't been merged yet, this will need to be manually merged. The label's just for the record.

@geekosaur geekosaur added merge me Tell Mergify Bot to merge and removed attention: needs-review labels Jun 24, 2024
@mergify mergify bot merged commit 260ecdc into 3.12 Jun 24, 2024
52 checks passed
@mergify mergify bot deleted the bootstrap-no-arch-native branch June 24, 2024 23:58
@geekosaur
Copy link
Collaborator Author

Huh. I wish mergify would be consistent about whether it's going to merge or not.

@ffaf1
Copy link
Collaborator

ffaf1 commented Jun 25, 2024

We may have removed the old bootstrap with @ffaf1 (did we?) when releasing 3.12.0.0 in order to conserve our sanity.

We did.

mergify bot added a commit that referenced this pull request Aug 1, 2024
regenerate bootstrap files without arch-native (backport #10148)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bootstrap plans still contain hashable-1.4.6.0 with +arch-native
4 participants