diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-09-05 13:05:16 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-09-05 23:12:50 -0400 |
| commit | 25f68acedf822e9ea21d1659b1f897fcfc96e5d4 (patch) | |
| tree | eb1237910939c3268c420497864432ac1299c28b | |
| parent | d2be80fd9b222963e8dd09a30f78c106e00da7f9 (diff) | |
| download | haskell-25f68acedf822e9ea21d1659b1f897fcfc96e5d4.tar.gz | |
gitlab-ci: Ensure that ghc derivation is in scope
Previously the lint-ci job attempted to use cabal-install (specifically
`cabal update`) without a GHC in PATH. However, cabal-install-3.8
appears to want GHC, even for `cabal update`.
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e5db3bb83..5fdbda2dc1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -267,7 +267,7 @@ lint-ci-config: - mkdir -p ~/.cabal - cp -Rf cabal-cache/* ~/.cabal || true script: - - nix shell --extra-experimental-features nix-command --extra-experimental-features flakes nixpkgs#cabal-install -c cabal update + - nix shell --extra-experimental-features nix-command --extra-experimental-features flakes nixpkgs#cabal-install nixpkgs#ghc -c cabal update - .gitlab/generate_jobs # 1 if .gitlab/generate_jobs changed the output of the generated config - nix shell --extra-experimental-features nix-command --extra-experimental-features flakes nixpkgs#git -c git diff --exit-code |