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

Bump version numbers to 3.10.3.0 #9728

Merged
merged 4 commits into from
Feb 21, 2024

Conversation

Kleidukos
Copy link
Member

Bump versions to 3.10.3.0

@Kleidukos
Copy link
Member Author

I'm trying to update the bootstrap files with 9.4.8 (instead of 9.4.5) and I'm getting this error:

src/Main.hs:22:1: error:
    Ambiguous module name ‘Distribution.Types.PackageName’:
      it was found in multiple packages:
      Cabal-3.6.3.0 Cabal-syntax-3.10.2.0
   |
22 | import qualified Distribution.Types.PackageName as C
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

src/Main.hs:23:1: error:
    Ambiguous module name ‘Distribution.Types.Version’:
      it was found in multiple packages:
      Cabal-3.6.3.0 Cabal-syntax-3.10.2.0
   |
23 | import qualified Distribution.Types.Version as C
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@mpickering
Copy link
Collaborator

You need to remove the 3.2.0.0 Cabal dependency clause in cabal-bootstrap-gen.cabal (see #9722)

@Kleidukos
Copy link
Member Author

@mpickering thank you. I imagine we should wait for your PR to be merged and then backport it to 3.10?

@Mikolaj
Copy link
Member

Mikolaj commented Feb 20, 2024

In that case, maybe we'd force-merge #9722 before the delay passes?

@mpickering
Copy link
Collaborator

I don't think that CI changes are suitable to back-port in general, it is much safer to apply just the changes needed to the CI configuration on the local branch so that there is less potential for change between minor releases.

In this case we certainly don't want to copy the bootstrap plans, those are likely to be wrong for the 3.10 branch!

@Kleidukos
Copy link
Member Author

@mpickering yes, of course. :)
Btw, what made you understand that Cabal 3.2.0.0 had to go? The error message mentions Cabal-3.6.3.0, so I'm a bit confused.

@mpickering
Copy link
Collaborator

@mpickering yes, of course. :) Btw, what made you understand that Cabal 3.2.0.0 had to go? The error message mentions Cabal-3.6.3.0, so I'm a bit confused.

Ah I think you need to delete 3.4 and 3.6 as well, because 3.8 is the first version where Cabal depended on Cabal-syntax, so if you choose 3.6 then you also need to satisfy the Cabal-syntax dependency (so it chooses 3.10) and you get this clash.

Another way to fix this is to probably delete the explicit Cabal-syntax dependency

@Mikolaj
Copy link
Member

Mikolaj commented Feb 20, 2024

CI died in the #9700 way. I'd propose to disable this one test on branch 3.10 in this very PR and continue [edit: continue the CI run beyond the failure] (there are some more steps in CI that get cancelled due to this failure). Releasing with a broken CI is unfortunate, but that's only a single test with a relatively old GHC, ao it's likely to be a fluke and releasing promptly has much higher priority IMHO.

@Kleidukos
Copy link
Member Author

@Mikolaj just so I understand, you approve bypassing the branch protection?

@Mikolaj
Copy link
Member

Mikolaj commented Feb 20, 2024

No, I propose disabling the failing test in the CI script.

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

@Kleidukos Kleidukos merged commit 1da02f1 into haskell:3.10 Feb 21, 2024
38 checks passed
@Kleidukos Kleidukos deleted the bump-version-3.10.3.0 branch February 21, 2024 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants