-
Notifications
You must be signed in to change notification settings - Fork 691
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
Conversation
(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 db4d518)
See comments. (cherry picked from commit d04a881)
(cherry picked from commit 7ce7b7a)
(cherry picked from commit ea1ec57) # Conflicts: # .github/workflows/validate.yml
(cherry picked from commit 4f58355) # 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)
It looks like it may be easier to do it manually... |
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. :) |
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. |
@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. |
Main work is in #8901. |
This is an automatic backport of pull request #8840 done by Mergify.
Cherry-pick of ba407e0 has failed:
Cherry-pick of 561bf1b has failed:
Cherry-pick of ea1ec57 has failed:
Cherry-pick of 4f58355 has failed:
Cherry-pick of 3b8e6e9 has failed:
Cherry-pick of bb10ae3 has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com