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

CI: add GHC 9.6.1 (backport #8840) #8899

Closed
wants to merge 12 commits into from
Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 5, 2023

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

On branch mergify/bp/3.10/pr-8840
Your branch is up to date with 'origin/3.10'.

You are currently cherry-picking commit ba407e067.
  (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-tests/Cabal-tests.cabal
	modified:   cabal-install-solver/cabal-install-solver.cabal
	modified:   cabal-install/cabal-install.cabal
	modified:   cabal-testsuite/cabal-testsuite.cabal

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cabal-tree-diff/Cabal-tree-diff.cabal

Cherry-pick of 561bf1b has failed:

On branch mergify/bp/3.10/pr-8840
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 561bf1b7c.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/validate.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of ea1ec57 has failed:

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

You are currently cherry-picking commit ea1ec5771.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/validate.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 4f58355 has failed:

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

You are currently cherry-picking commit 4f5835509.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/validate.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 3b8e6e9 has failed:

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

You are currently cherry-picking commit 3b8e6e9bf.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/validate.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of bb10ae3 has failed:

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

You are currently cherry-picking commit bb10ae32b.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/validate.yml

no changes added to commit (use "git add" and/or "git commit -a")

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

(cherry picked from commit ba407e0)

# Conflicts:
#	Cabal-tree-diff/Cabal-tree-diff.cabal
(cherry picked from commit 561bf1b)

# Conflicts:
#	.github/workflows/validate.yml
(cherry picked from commit ea1ec57)

# Conflicts:
#	.github/workflows/validate.yml
(cherry picked from commit 4f58355)

# Conflicts:
#	.github/workflows/validate.yml
undo 6bd17fc from #8844; the change was made in response to an issue
that was later fixed on the haskell/action side

(cherry picked from commit 3b8e6e9)

# Conflicts:
#	.github/workflows/validate.yml
haskell/acitons support prereleases since recently, and so, a separate
workflow is not necessary.

(cherry picked from commit bb10ae3)

# Conflicts:
#	.github/workflows/validate.yml
(cherry picked from commit a68c07d)
It hasn't been used for a while now.

(cherry picked from commit 2e8a1e1)
@mergify mergify bot added the conflicts label Apr 5, 2023
@mergify mergify bot mentioned this pull request Apr 5, 2023
15 tasks
@mergify mergify bot added the backport label Apr 5, 2023
@ulysses4ever
Copy link
Collaborator

It looks like it may be easier to do it manually...

@Mikolaj
Copy link
Member

Mikolaj commented Apr 5, 2023

Wow, how come. I specifically waited for this backport with some tweaks on 3.10 branch. To the point that I forgot what these tweaks were supposed to be. Probably some are already in this PR anyway. :)

@Mikolaj
Copy link
Member

Mikolaj commented Apr 6, 2023

Almost all conflicts are in .github/workflows/validate.yml (the changed CI cache workaround) that should probably be just overwritten to the version from the PR.

@ulysses4ever
Copy link
Collaborator

@Mikolaj if you have energy to push it over the line, I'm all for it. I don't remember from top of the head if simply replacing the .yml is the right way: maybe 3.10 branch needs something more nuanced (e.g. my main worry is what version of cabal would be used and whether or not some version bumps should be done). But CI will show if this is acceptable.

@ulysses4ever
Copy link
Collaborator

Main work is in #8901.

@mergify mergify bot deleted the mergify/bp/3.10/pr-8840 branch April 18, 2023 01:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants