Bump versions and deps on master branch to 3.11 and regenerate bootstrap files #8844
Conversation
|
It seems I need to update bootstrap files in the same PR to keep them compiling. |
|
And 3.10 is apparently too new yet for the Custom setup in cabal-testsuite. Perhaps it needs to wait until GHA provides it (not just ghcup)? In any case, let me downgrade to make it work again. The funny thing is, 3.10.1.0 works fine on 3.10 branch, but that's probably, because it takes it from in-place build. |
|
@Mikolaj the GHA already has verything possible (3.10, 9.6, etc.) — Andreas manages it these days. I'm not super sure but I think for the testsuite to compile you need to simultaneously do two things
I tried the second in #8840 but it didn't go through because I didn't do the first. So it makes sense to rather do it here I think. |
|
Well, my comment didn't take this into account: haskell/actions#202 (comment) |
|
I'm not sure about my hypothesis, either, but setting it to 3.10 failed and, I think, not even on Windows. Let's see... |
|
I invalidated your both reviews. I apologise --- I did not expect I will have to update bootstrap files in the same PR, hence I asked for reviews so early. |
|
no worries 👍 |
Mikolaj
changed the title
|
I have one more commit prepared where I bump Custom Setup cabal in cabal-testsuite to 3.10 and bump cabal to 3.10 in validate, as @ulysses4ever recommends and which is probably why it didn't work before. But let me see how this CI succeeds. I'm going to fast-merge anyway, to let @ulysses4ever complete the overhaul in #8840. |
|
OK, all bootstraps passed and one validate did and nothing failed. Let me try the extra commit. |
|
Hah, @ulysses4ever: I see I need to steal your e6e07e8 |
Mikolaj
added
the
merge delay passed
|
Job "Validate ubuntu-20.04 ghc-prerelease" fails with lots of mentions of "setup.Cabal-3.9.0.0/installed-3.9.0.0". How come? It has to come from CI cache, right? Because it doesn't have access to cabal 3.9 from anywhere else. If so, clearing the cache should be enough or switching to 9.6.1. |
|
@mergify backport 3.10 |
✅ Backports have been created
|
…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 <a.pelenitsyn@gmail.com> (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
…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 <a.pelenitsyn@gmail.com>
This is a counterpart of #8799 but for master branch. Now it should not break CI, because cabal 3.10 is already on Hackage, so it can be performed. The opposite, it should fix some other problems on CI due to stable release change.