diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-12-12 16:29:49 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-01-06 22:08:53 -0500 |
| commit | c306d939d2e1b08cbe683bb9829a4b4010948010 (patch) | |
| tree | 5abf20bfa52f0ef2a59129e4392a886c070660e9 /.gitlab/ci.sh | |
| parent | ac39e8e97fbb69e4a786c1c29d6e477e7944f998 (diff) | |
| download | haskell-c306d939d2e1b08cbe683bb9829a4b4010948010.tar.gz | |
ci: Upgrade darwin, windows and freebsd CI to use GHC-9.4.3
Fixes #22599
Diffstat (limited to '.gitlab/ci.sh')
| -rwxr-xr-x | .gitlab/ci.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 479a4c4f06..87f9b96525 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -213,10 +213,14 @@ function set_toolchain_paths() { x86_64-darwin|aarch64-darwin) ;; *) fail "unknown NIX_SYSTEM" ;; esac - nix build -f .gitlab/darwin/toolchain.nix --argstr system "$NIX_SYSTEM" -o toolchain.sh + info "Building toolchain for $NIX_SYSTEM" + nix-build .gitlab/darwin/toolchain.nix --argstr system "$NIX_SYSTEM" -o toolchain.sh cat toolchain.sh fi - source toolchain.sh ;; + source toolchain.sh + info "--info for GHC for $NIX_SYSTEM" + $GHC --info + ;; env) # These are generally set by the Docker image but # we provide these handy fallbacks in case the @@ -320,7 +324,7 @@ function fetch_cabal() { MINGW64) cabal_arch="x86_64" ;; *) fail "unknown MSYSTEM $MSYSTEM" ;; esac - url="https://downloads.haskell.org/~cabal/cabal-install-$v/cabal-install-$v-$cabal_arch-unknown-mingw32.zip" + url="https://downloads.haskell.org/~cabal/cabal-install-$v/cabal-install-$v-$cabal_arch-windows.zip" info "Fetching cabal binary distribution from $url..." curl "$url" > "$TMP/cabal.zip" unzip "$TMP/cabal.zip" |