on master help sign in
Merge pull request #4508 from commercialhaskell/nightly

Merge in nightly, upgrading to GHC 8.6.5

commitddd712a53d1b68b40f414677e708b627a10c0f2e authorAdam Bergmark <adam@bergmark.nl> dateMon 29 Apr 2019, 13:50 (7 years ago) parent87c9155d858276
4 files changed+4−4
Dockerfile+1−1 build-constraints.yaml+1−1 check+1−1 etc/ci-script.sh+1−1
Dockerfile+1−1
@@ -2,7 +2,7 @@ FROM fpco/pid1:18.04
22
33ENV HOME /home/stackage
44ENV LANG en_US.UTF-8
5−ENV GHCVER 8.6.4
5+ENV GHCVER 8.6.5
66
77# NOTE: also update debian-bootstrap.sh when cuda version changes
88ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin
build-constraints.yaml+1−1
@@ -1,6 +1,6 @@
11ghc-major-version: "8.6"
22# new curator is supposed to use exact GHC version
3−ghc-version: "8.6.4"
3+ghc-version: "8.6.5"
44
55# This affects which version of the Cabal file format we allow. We
66# should ensure that this is always no greater than the version
check+1−1
@@ -3,4 +3,4 @@
33# Convenience script for checking constraints locally
44
55cd `dirname $0`
6−exec stack exec --resolver ghc-8.6.4 stackage-curator check
6+exec stack exec --resolver ghc-8.6.5 stackage-curator check
etc/ci-script.sh+1−1
@@ -2,7 +2,7 @@
22
33set -euxo pipefail
44
5−export GHCVER=8.6.4
5+export GHCVER=8.6.5
66
77# Download and unpack the stack executable
88mkdir -p ~/.local/bin