diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-04-13 11:42:23 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-04-18 13:21:05 -0400 |
| commit | 2ee96ac1aa2cbff4e70bc45988930d64599029f2 (patch) | |
| tree | 587649cc512c68c47b73624e1efa8f9ac5ae1695 | |
| parent | 84cc8394d075cea236faa0bcd9ef0a84de89ee8c (diff) | |
| download | haskell-2ee96ac1aa2cbff4e70bc45988930d64599029f2.tar.gz | |
gitlab-ci: Bump FreeBSD bootstrap compiler to 8.10.1
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | .gitlab/ci.sh | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e830ea1565..be5ce495a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -317,8 +317,8 @@ hadrian-ghc-in-ghci: # porting guide [1]. # [1] https://www.freebsd.org/doc/en/books/porters-handbook/using-iconv.html) CONFIGURE_ARGS: "--with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib" - GHC_VERSION: 8.6.3 - CABAL_INSTALL_VERSION: 3.0.0.0 + GHC_VERSION: 8.10.1 + CABAL_INSTALL_VERSION: 3.2.0.0 BIN_DIST_PREP_TAR_COMP: "ghc-x86_64-portbld-freebsd.tar.xz" TEST_ENV: "x86_64-freebsd" BUILD_FLAVOUR: "validate" diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index ff612f663e..d3e922ff86 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -139,12 +139,6 @@ function set_toolchain_paths() { export CABAL export HAPPY export ALEX - - # FIXME: Temporarily use ghc from ports - case "$(uname)" in - FreeBSD) GHC="/usr/local/bin/ghc" ;; - *) ;; - esac } # Extract GHC toolchain |