Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (backport #8844)#8847
Closed
mergify[bot] wants to merge 1 commit into3.10from
Closed
Bump versions and deps on master branch to 3.11 and regenerate bootstrap files (backport #8844)#8847mergify[bot] wants to merge 1 commit into3.10from
mergify[bot] wants to merge 1 commit into3.10from
Conversation
…rap files (#8844) * Bump versions on master branch to 3.11 * Try to fix CI by setting cabal-testsuite stable Cabal version to 3.8 back again * Update bootstrap configuration * Work around bounds problem with cabal-install-parsers * Update bootstrap files * Try to update the Custom setup cabal to 3.10 according to Artem's suggestion * CI: cabal-3.10 compat: actions/cache has to go before cabal update * Fix failing old GHC CI builds by adding XDG's ~/.local/bin to GITHUB_PATH --------- Co-authored-by: Artem Pelenitsyn <[email protected]> (cherry picked from commit dfe7393) # Conflicts: # .github/workflows/bootstrap.yml # Cabal-QuickCheck/Cabal-QuickCheck.cabal # Cabal-described/Cabal-described.cabal # Cabal-syntax/Cabal-syntax.cabal # Cabal-tree-diff/Cabal-tree-diff.cabal # Cabal/Cabal.cabal # Cabal/Makefile # Makefile # bootstrap/cabal-bootstrap-gen.cabal # bootstrap/linux-8.10.7.json # bootstrap/linux-9.0.2.json # bootstrap/linux-9.2.3.json # bootstrap/linux-9.2.6.json # bootstrap/linux-9.2.7.json # bootstrap/linux-9.4.4.json # cabal-install-solver/cabal-install-solver.cabal # cabal-install/cabal-install.cabal # cabal-install/src/Distribution/Client/Version.hs # cabal-testsuite/cabal-testsuite.cabal # doc/conf.py # solver-benchmarks/solver-benchmarks.cabal
Member
|
Actually, I only wanted to backport the bootstrap configuration changes, so I will need to do that by hand. Also, I will wait until @ulysses4ever figures out GHA caches in #8840 and so it gets fixed on master branch before backporting here bits of the boostrap stuff and CI fixes and the whole GHC 9.6.1 overhaul. Closing. |
Member
|
On a second thought, bootstraps are used from master branch, so let's keep them on 3.10 branch as is, unless they start failing CI. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #8844 done by Mergify.
Cherry-pick of dfe7393 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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill 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