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.

Sign up for GitHub

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

Jump to bottom

Bump base in cabal-dev-scripts.cabal #9303

Merged
merged 3 commits into from
Oct 5, 2023
Merged

Bump base in cabal-dev-scripts.cabal #9303

merged 3 commits into from
Oct 5, 2023

Conversation

andreabedini
Copy link
Collaborator

Bump base in cabal-dev-scripts.cabal. We are now using GHC 9.4.7 in CI, which ships with base 4.17.2.0. I am bumping all the way to <4.19 after testing everything compiles with GHC 9.6.3 (base-4.18.1.0).

Template Β: This PR does not modify cabal behaviour (documentation, tests, refactoring, etc.)

Include the following checklist in your PR:

@andreabedini
Bump base in cabal-dev-scripts.cabal
033e8e0 
Bump base in cabal-dev-scripts.cabal. We are now using GHC 9.4.7 in CI, which ships with base 4.17.2.0. I am bumping all the way to <4.19 after testing everything compiles with GHC 9.6.3 (base-4.18.1.0).
@geekosaur
Copy link
Collaborator

Not sure what's up with doctest.

Should this perhaps go to < 4.20 in preparation for 9.8?

@andreabedini andreabedini self-assigned this Oct 3, 2023
@andreabedini
Copy link
Collaborator Author

Not sure what's up with doctest.

:-/ I will have a look

Should this perhaps go to < 4.20 in preparation for 9.8?

If it works ... sure :)

Mikolaj
Mikolaj approved these changes Oct 3, 2023
View reviewed changes
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.

Thank you. And even better if you manage to relax the bound further, because it's a recurring annoyance, so let's kick the can down the road as far as we can. :D

@Mikolaj
Copy link
Member

Mikolaj commented Oct 3, 2023

@mergify backport 3.10

@mergify
Copy link
Contributor

mergify bot commented Oct 3, 2023 •
edited
Loading

backport 3.10

✅ Backports have been created

@Mikolaj
Copy link
Member

Mikolaj commented Oct 3, 2023 •
edited
Loading

I remember doctests have been overhauled recently and indeed they always used the GHC version that comes with GHA:

#8735

I've just checked and we install the newest version of package doctest, so it's not that we miss an upstream fix to a known problem

this part is already new, appearing only since yesterday:

when making flags consistent: error: [-Werror]   
Optimization flags conflict with --interactive; optimization flags ignored.

@geekosaur geekosaur mentioned this pull request Oct 3, 2023
Merged
1 task
@ulysses4ever
Copy link
Collaborator

I wish we had a ticket for the failing doctest job. Meanwhile, I can repro it locally with GHC 9.4.4.

@geekosaur
Copy link
Collaborator

Here you go: #9307

andreabedini and others added 2 commits October 4, 2023 17:56
@andreabedini
Avoid OverloadedStrings when it causes troubles
dc08acb
@ulysses4ever
doctest: provide a separate project file without -Werror (fix #9307)
ccce7c3 
This became necessary after an upgrade to GHC 9.4, which, apparently,
has a subtle change in how -W/-w-related things get interpreted.
@geekosaur geekosaur mentioned this pull request Oct 5, 2023
Closed
4 tasks
@ulysses4ever ulysses4ever added the merge me Tell Mergify Bot to merge label Oct 5, 2023
@andreabedini
Copy link
Collaborator Author

Skipping the merge queue to unbreak the CI on main branch. I hope this is ok.

@andreabedini andreabedini merged commit bf52f18 into master Oct 5, 2023
43 checks passed
@andreabedini andreabedini deleted the andreabedini-patch-1 branch October 5, 2023 08:34
@mergify mergify bot mentioned this pull request Oct 5, 2023
Merged
@ulysses4ever
Copy link
Collaborator

@andreabedini Yes, absolutely. I should have done it earlier.

By the way, a potentially less disturbing way to achieve fast tracking is to put the merge-delay-passed label. That's what we usually do.

Mikolaj pushed a commit that referenced this pull request Oct 5, 2023
@mergify @andreabedini @ulysses4ever
Bump base in cabal-dev-scripts.cabal (backport #9303) (#9311)
0f2350c 
* Bump base in cabal-dev-scripts.cabal

Bump base in cabal-dev-scripts.cabal. We are now using GHC 9.4.7 in CI, which ships with base 4.17.2.0. I am bumping all the way to <4.19 after testing everything compiles with GHC 9.6.3 (base-4.18.1.0).

(cherry picked from commit 033e8e0)

* Avoid OverloadedStrings when it causes troubles

(cherry picked from commit dc08acb)

# Conflicts:
#	Cabal-syntax/src/Distribution/Fields/Parser.hs

* doctest: provide a separate project file without -Werror (fix #9307)

This became necessary after an upgrade to GHC 9.4, which, apparently,
has a subtle change in how -W/-w-related things get interpreted.

(cherry picked from commit ccce7c3)

* fixup! resolve a conflict

---------

Co-authored-by: Andrea Bedini <andrea.bedini@tweag.io>
Co-authored-by: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Oct 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mikolaj Mikolaj Mikolaj approved these changes

@geekosaur geekosaur geekosaur approved these changes

Assignees

@andreabedini andreabedini

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@andreabedini @geekosaur @Mikolaj @ulysses4ever