diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-08-05 16:13:48 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-08-09 13:46:48 -0400 |
| commit | ea90e61dc3c6ba0433e008284dc6c3970ead98a7 (patch) | |
| tree | 37ae0bb29698f9fe12272673adb230ed124ec0f3 /.gitlab/ci.sh | |
| parent | 5d66a0ce39f47b7b9f6c732a18ac6e102a21ee6b (diff) | |
| download | haskell-ea90e61dc3c6ba0433e008284dc6c3970ead98a7.tar.gz | |
gitlab-ci: Bump to use freebsd13 runners
Diffstat (limited to '.gitlab/ci.sh')
| -rwxr-xr-x | .gitlab/ci.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 8ff9c688cd..f55d4e1f92 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -207,6 +207,9 @@ function set_toolchain_paths() { CABAL="$toolchain/bin/cabal$exe" HAPPY="$toolchain/bin/happy$exe" ALEX="$toolchain/bin/alex$exe" + if [ "$(uname)" = "FreeBSD" ]; then + GHC=/usr/local/bin/ghc + fi ;; nix) if [[ ! -f toolchain.sh ]]; then @@ -288,7 +291,7 @@ function fetch_ghc() { cp -r ghc-${GHC_VERSION}*/* "$toolchain" ;; *) - pushd "ghc-${GHC_VERSION}*" + pushd ghc-${GHC_VERSION}* ./configure --prefix="$toolchain" "$MAKE" install popd @@ -326,9 +329,7 @@ function fetch_cabal() { local base_url="https://downloads.haskell.org/~cabal/cabal-install-$v/" case "$(uname)" in Darwin) cabal_url="$base_url/cabal-install-$v-x86_64-apple-darwin17.7.0.tar.xz" ;; - FreeBSD) - #cabal_url="$base_url/cabal-install-$v-x86_64-portbld-freebsd.tar.xz" ;; - cabal_url="http://home.smart-cactus.org/~ben/ghc/cabal-install-3.0.0.0-x86_64-portbld-freebsd.tar.xz" ;; + FreeBSD) cabal_url="$base_url/cabal-install-$v-x86_64-freebsd13.tar.xz" ;; *) fail "don't know where to fetch cabal-install for $(uname)" esac echo "Fetching cabal-install from $cabal_url" |