diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-09-05 13:05:16 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-10-16 10:41:41 -0400 |
| commit | 9a12e4961256f4c25201b8b8736ab4ef4ba0083e (patch) | |
| tree | 15e2a2abaa84e1669193755d263a1f8520c2c8d9 | |
| parent | 6af677a99fb8a5992897928b6fbb4e68879467ec (diff) | |
| download | haskell-9a12e4961256f4c25201b8b8736ab4ef4ba0083e.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`.
(cherry picked from commit 25f68acedf822e9ea21d1659b1f897fcfc96e5d4)
| -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 9cf689f3b3..9f54450d70 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 |