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

Update cabal-install to allow time 1.14 #9851

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Conversation

geekosaur
Copy link
Collaborator

@geekosaur geekosaur commented Mar 28, 2024

Note that #9848 covers Cabal and Cabal-syntax already.
For sanity's sake, #9848 should probably be committed first.

Template Β: This PR does not modify cabal behaviour (documentation, tests, refactoring, 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). (n/a)

@geekosaur
Copy link
Collaborator Author

As noted in #9848, this needs to be validated locally by reviewers because time is a bootlib. I found I needed an allow-newer as well, because one of our (test?) dependencies didn't have its bounds adjusted yet.

@Mikolaj
Copy link
Member

Mikolaj commented Apr 6, 2024

I think @ulysses4ever prototyped a tool to permit precisely such a usage of our own CI, but I can't find docs for it.

@ulysses4ever
Copy link
Collaborator

They're at the bottom of CONTRIBUTING.md, I think

@Mikolaj
Copy link
Member

Mikolaj commented Apr 6, 2024

Oh, great, thank you. I only searched in READMEs and the Wiki. I've updated the placeholder with the link at the bottom of https://github.com/haskell/cabal/wiki/Cabal-Packages-Hackage-Revision-Policy.

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.

Looks good and Artem reports:

started CI run of the Validate workflow with time==1.14: https://github.com/haskell/cabal/actions/runs/8650585264
will see how it goes
Validate · haskell/cabal@8e971f5 - GitHub
Official upstream development repository for Cabal and cabal-install - Validate · 8e971f5
... it failed for an unfortunate reason: validate uses various ghc and some come with base older than the lower bound on base that time-1.14 has. This is clearly a shortcoming of this approach for testing version bumps :-( I'll think if there's a way around it. But in the meantime you may want to just trust the PR author that they tested it locally on one GHCV at least...
actually, the static exe job succeeded with time-1.14! https://github.com/haskell/cabal/actions/runs/8650585264/job/23719429299

@Mikolaj
Copy link
Member

Mikolaj commented Apr 12, 2024

@ffaf1: we have two compilation tests with the bound forced, so I think it's fine for you to approve and set the merge label without repeating the tests.

@ffaf1 ffaf1 added merge me Tell Mergify Bot to merge and removed attention: needs-review labels Apr 16, 2024
@Mikolaj Mikolaj added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Apr 16, 2024
Note that #9848 covers Cabal and Cabal-syntax already.
@Mikolaj Mikolaj force-pushed the time-1.14-cabal-install branch from 8b32deb to 65842cb Compare April 16, 2024 16:25
@Mikolaj
Copy link
Member

Mikolaj commented Apr 16, 2024

I've we set the delay_passed label by hand. It's been untouched for 4 days and will now take some more time for CI to pass after rebase anyway.

@mergify mergify bot merged commit 50a5cb6 into master Apr 16, 2024
50 checks passed
@mergify mergify bot deleted the time-1.14-cabal-install branch April 16, 2024 18:12
@ffaf1
Copy link
Collaborator

ffaf1 commented Apr 18, 2024

@mergify backport 3.12

Copy link
Contributor

mergify bot commented Apr 18, 2024

backport 3.12

✅ Backports have been created

mergify bot added a commit that referenced this pull request May 1, 2024
Update cabal-install to allow time 1.14 (backport #9851)
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 merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants