[Git][ghc/ghc][master] 2 commits: Use Hackage version of Cabal 3.14.0.0 for Hadrian.

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
c76e25b3 by Hécate Kleidukos at 2024-09-21T17:51:07-04:00
Use Hackage version of Cabal 3.14.0.0 for Hadrian.
We remove the vendored Cabal submodule.

Also update the bootstrap plans

Fixes #25086

- - - - -
6c83fd7f by Zubin Duggal at 2024-09-21T17:51:07-04:00
ci: Ensure we source ci.sh in any jobs that run commands outside of ci.sh

ci.sh sets up the toolchain environment, including paths for the cabal directory, the
toolchain binaries etc. If we run any commands outside of ci.sh, unless we
source ci.sh we will use the wrong values for these environment variables.

In particular, I ran into an issue where the cabal invocation `hadrian/ghci` was
using an old index state despite `ci.sh setup` updating and setting the correct
index state. This is because `ci.sh` sets the `CABAL_DIR` to a different place, which
is where the index was downloaded to, but we were using the default cabal directory
outside ci.sh

The solution is to source the correct environment `ci.sh` using `. ci.sh setup`

- - - - -


10 changed files:

- .gitignore
- .gitlab-ci.yml
- .gitlab/ci.sh
- .gitmodules
- hadrian/bootstrap/bootstrap.py
- hadrian/bootstrap/generate_bootstrap_plans
- hadrian/bootstrap/plan-9_10_1.json
- − hadrian/bootstrap/plan-9_4_1.json
- − hadrian/bootstrap/plan-9_4_2.json
- − hadrian/bootstrap/plan-9_4_3.json


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/620becd72ec18ca08c1ed86759d65a0e614fe43c...6c83fd7fa7fcb18c88616c6b30b1c67acc9273b7

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/620becd72ec18ca08c1ed86759d65a0e614fe43c...6c83fd7fa7fcb18c88616c6b30b1c67acc9273b7
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240921/a0aad57d/attachment.html>