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 base in cabal-dev-scripts.cabal (backport #9303) #9311

Merged
merged 4 commits into from
Oct 5, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 5, 2023

This is an automatic backport of pull request #9303 done by Mergify.
Cherry-pick of dc08acb has failed:

On branch mergify/bp/3.10/pr-9303
Your branch is ahead of 'origin/3.10' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit dc08acb9c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cabal-syntax/src/Distribution/InstalledPackageInfo.hs
	modified:   Cabal-syntax/src/Distribution/Types/Dependency.hs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cabal-syntax/src/Distribution/Fields/Parser.hs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

andreabedini and others added 3 commits October 5, 2023 08:35
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)
(cherry picked from commit dc08acb)

# Conflicts:
#	Cabal-syntax/src/Distribution/Fields/Parser.hs
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)
@mergify mergify bot added the conflicts label Oct 5, 2023
@mergify mergify bot mentioned this pull request Oct 5, 2023
1 task
@mergify mergify bot added the backport label Oct 5, 2023
@ulysses4ever
Copy link
Collaborator

What a silly conflict!

@ulysses4ever ulysses4ever added squash+merge me Tell Mergify Bot to squash-merge and removed conflicts labels Oct 5, 2023
@Mikolaj
Copy link
Member

Mikolaj commented Oct 5, 2023

Hah, weird. Thank you. Since it's a test/CI-only change and the 3.10.2.0 release process may turn out to need CI urgently at the last moment, let me merge ASAP, via label, if it works, and via the button, otherwise.

@Mikolaj Mikolaj added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Oct 5, 2023
@Mikolaj Mikolaj merged commit 0f2350c into 3.10 Oct 5, 2023
37 checks passed
@Mikolaj Mikolaj deleted the mergify/bp/3.10/pr-9303 branch October 5, 2023 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants