Skip to content

Cabal: Bump time upper bound to allow 1.12 #7863

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
Dec 13, 2021
Merged

Conversation

bgamari
Copy link
Contributor

@bgamari bgamari commented Dec 10, 2021

In service of GHC #20547.


Please include the following checklist in your PR:

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

@Mikolaj
Copy link
Member

Mikolaj commented Dec 10, 2021

I can see

cabal-install/cabal-install.cabal:        time       >= 1.5.0.1  && < 1.11,

@bgamari: could you bump that as well so that we all test the same thing on branch master?

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.

Restarted CI seems to be fine.

I intend to backport this to 3.6 to give the GHC hackers the option of using either branch. I will also make a PR that bumps cabal-install similarly, but not backport it, so that we can dog-food on master ASAP without enddangering 3.6. Please discuss if that doesn't sound good.

@fgaz
Copy link
Member

fgaz commented Dec 11, 2021

CI is not testing this change because time is included with ghc (what was the name for that? core/boot package?) and won't be upgraded...
@bgamari Did you test this?

@Mikolaj Mikolaj removed the merge me Tell Mergify Bot to merge label Dec 11, 2021
@Mikolaj
Copy link
Member

Mikolaj commented Dec 11, 2021

@fgaz: well spotted. So we'd need to change the bounds temporarily to only allow 1.12, to get this tested?

@fgaz
Copy link
Member

fgaz commented Dec 11, 2021

or add time==1.12 to constraints in cabal.project.validate{.libonly}. I don't know if previous maintainers had a faster way to test such changes

@bgamari
Copy link
Contributor Author

bgamari commented Dec 12, 2021

CI is not testing this change because time is included with ghc (what was the name for that? core/boot package?) and won't be upgraded... @bgamari Did you test this?

Yes, I tested it in a local GHC tree.

@bgamari
Copy link
Contributor Author

bgamari commented Dec 12, 2021

cabal-install/cabal-install.cabal: time >= 1.5.0.1 && < 1.11,

Historically we have bumped cabal-install and Cabal separately as the former is harder for me to test.

Copy link
Member

@fgaz fgaz left a comment

Choose a reason for hiding this comment

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

Yes, I tested it in a local GHC tree.

That's enough for me, and the changelog looks harmless

@Mikolaj Mikolaj added the merge me Tell Mergify Bot to merge label Dec 13, 2021
@mergify mergify bot merged commit 022cfaa into haskell:master Dec 13, 2021
@Mikolaj
Copy link
Member

Mikolaj commented Dec 13, 2021

@Mergifyio backport 3.6

@mergify
Copy link
Contributor

mergify bot commented Dec 13, 2021

backport 3.6

✅ Backports have been created

Mikolaj added a commit that referenced this pull request Dec 22, 2021
Cabal: Bump time upper bound to allow 1.12 (backport #7863)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Cabal: other merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants