Skip to content

Bump cabal-bootstrap-gen to GHC 9.4.4 ecosystem #8720

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

Merged
merged 1 commit into from
Feb 16, 2023

Conversation

nmeum
Copy link
Collaborator

@nmeum nmeum commented Feb 1, 2023

I updated the dependencies in the .cabal bootstrap file and sightly adjusted src/Main.hs for the I.riCabal → I.riCabalHash change. I successfully bootstrapped Cabal on Alpine Linux Edge with these changes. I am new to Cabal so let me know if this needs any adjustments.

Fixes #8613


Please include the following checklist in your PR:

Please also shortly describe how you tested your change. Bonus points for added tests!

@robx
Copy link
Collaborator

robx commented Feb 2, 2023

This should probably add GHC 9.4.4 to BOOTSTRAP_VERSIONS in the top-level Makefile and to .github/workflows/bootstrap.yml.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 2, 2023

@nmeum: BTW, please feel free to compare with old PRs that update the generator and/or generate files for new GHCs.

@nmeum
Copy link
Collaborator Author

nmeum commented Feb 8, 2023

@nmeum: BTW, please feel free to compare with old PRs that update the generator and/or generate files for new GHCs.

I tried to follow #8403 but somehow this PR didn't include changes to the top-level Makefile and the CI. I just updated the PR accordingly in the hope that I modified these files correctly.

Copy link
Collaborator

@robx robx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, though I haven't tested it locally. Bootstrap CI passes so the generated files should be fine at least. (CI doesn't cover bootstrap-gen itself.)

@Mikolaj
Copy link
Member

Mikolaj commented Feb 9, 2023

Let me rebase so that CI unbreaks (we worked around some infrastructure breakage).

@nmeum: did you perchance test the new scripts with GHCs other than 9.4.4? Ideally with all listed in the Makefile? I guess it's fine if they produce differenct bootstrap files than in the repo, but a smoke test would be comparing if the sizes are similar.

After your are satisfied about your due diligence, please kindly set the merge_me label.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 9, 2023

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2023

⚠️ This pull request got rebased on behalf of a random user of the organization.
This behavior will change on the 1st February 2023, Mergify will pick the author of the pull request instead.

To get the future behavior now, you can configure bot_account options (e.g.: bot_account: { author } or update_bot_account: { author }.

Or you can create a dedicated github account for squash and rebase operations, and use it in different bot_account options.

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2023

rebase

✅ Branch has been successfully rebased

@Mikolaj
Copy link
Member

Mikolaj commented Feb 9, 2023

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2023

⚠️ This pull request got rebased on behalf of a random user of the organization.
This behavior will change on the 1st February 2023, Mergify will pick the author of the pull request instead.

To get the future behavior now, you can configure bot_account options (e.g.: bot_account: { author } or update_bot_account: { author }.

Or you can create a dedicated github account for squash and rebase operations, and use it in different bot_account options.

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2023

rebase

✅ Branch has been successfully rebased

@nmeum
Copy link
Collaborator Author

nmeum commented Feb 13, 2023

Given that this passes CI and has been approved: Do you need me to do anything else to get this merged or is it just a question of time? :)

@Kleidukos
Copy link
Member

@nmeum All good on our side, you may set the label merge-me and remove the attention: needs-review label :)

@Mikolaj
Copy link
Member

Mikolaj commented Feb 13, 2023

@nmeum: as as @Kleidukos said. And feel free to read CONTRIBUTING.md if in doubt.

BTW, did you catch the below comment of mine?

@nmeum: did you perchance test the new scripts with GHCs other than 9.4.4? Ideally with all listed in the Makefile? I guess it's fine if they produce differenct bootstrap files than in the repo, but a smoke test would be comparing if the sizes are similar.

After your are satisfied about your due diligence, please kindly set the merge_me label.

@nmeum
Copy link
Collaborator Author

nmeum commented Feb 14, 2023

BTW, did you catch the below comment of mine?

@nmeum: did you perchance test the new scripts with GHCs other than 9.4.4? Ideally with all listed in the Makefile? I guess it's fine if they produce differenct bootstrap files than in the repo, but a smoke test would be comparing if the sizes are similar.

Sorry, I somehow missed your comment. I only tested this with GHC 9.4.4. I am using this changeset for bootstrapping Cabal for the Alpine Linux Cabal package and hence have only tested this with the GHC version available in the Alpine repositories (9.4.4).

@nmeum nmeum added the merge me Tell Mergify Bot to merge label Feb 14, 2023
@Mikolaj
Copy link
Member

Mikolaj commented Feb 14, 2023

I only tested this with GHC 9.4.4. I am using this changeset for bootstrapping Cabal for the Alpine Linux Cabal package and hence have only tested this with the GHC version available in the Alpine repositories (9.4.4).

That's fine. If somebody manages to test during the 2 days delay period after setting the label, it'd be great. But if not, we still have a long time before cabal 3.10.2 or 3.12, so we may hear from other boostrappers and fix, as necessary.

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Feb 16, 2023
I updated the dependencies in the .cabal bootstrap file and
sightly adjusted src/Main.hs for the `I.riCabal → I.riCabalHash`
change.

Fixes haskell#8613
@mergify
Copy link
Contributor

mergify bot commented Feb 16, 2023

⚠️ This pull request got rebased on behalf of a random user of the organization.
This behavior will change on the 1st February 2023, Mergify will pick the author of the pull request instead.

To get the future behavior now, you can configure bot_account options (e.g.: bot_account: { author } or update_bot_account: { author }.

Or you can create a dedicated github account for squash and rebase operations, and use it in different bot_account options.

@mergify mergify bot merged commit a5765af into haskell:master Feb 16, 2023
@Mikolaj
Copy link
Member

Mikolaj commented Feb 16, 2023

I wonder if we should backport this to 3.10? I guess so. Let me create a backport PR and then ask people.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 16, 2023

@mergify backport 3.10

@mergify
Copy link
Contributor

mergify bot commented Feb 16, 2023

backport 3.10

✅ Backports have been created

mergify bot added a commit that referenced this pull request Feb 21, 2023
Bump cabal-bootstrap-gen to GHC 9.4.4 ecosystem (backport #8720)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cabal-install: bootstrap merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bootstrap file for GHC 9.4 on Linux
6 participants