diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-09-05 13:05:16 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2022-09-05 13:10:21 -0400 |
| commit | 1f72693cfb48af543977b4d8a7534e5381d986de (patch) | |
| tree | 2fe4012e0f2c2f533f9aece117f979ff901c440e | |
| parent | cbe51ac5e0bbe2667b6c7204ae62a534a9bc7c95 (diff) | |
| download | haskell-wip/fix-ci.tar.gz | |
gitlab-ci: Ensure that ghc derivation is in scopewip/fix-ci
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 6ed24d600b..c796d24147 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 |