git.iko.soy/stackage
on 7c92436 help sign in
5d4ad03
swap
3 ahead, 4876 behind
4 files changed+18−16
since splitsnapshots
unifiedsplit
Dockerfile+2−1 check+1−1 debian-bootstrap.sh+14−13 etc/ci-script.sh+1−1
Dockerfile+2−1
@@ -2,9 +2,10 @@ FROM fpco/pid1:16.04
22
33ENV HOME /home/stackage
44ENV LANG en_US.UTF-8
5+ENV GHCVER 8.6.4
56
67# NOTE: also update debian-bootstrap.sh when cuda version changes
7−ENV PATH /usr/local/cuda-10.0/bin:/opt/ghc/8.6.3/bin:/usr/sbin:/usr/bin:/sbin:/bin
8+ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin
89ENV CUDA_PATH /usr/local/cuda-10.0
910ENV LD_LIBRARY_PATH=/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/nvvm/lib64
1011
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.3 stackage-curator check
6+exec stack exec --resolver ghc-8.6.4 stackage-curator check
debian-bootstrap.sh+14−13
@@ -10,23 +10,29 @@
1010# instructions, see:
1111# http://www.stackage.org/install
1212
13−set -exu
13+set -exuo pipefail
1414
1515mkdir /home/stackage -p
1616
1717export DEBIAN_FRONTEND=noninteractive
18+
19+# Get curl
20+apt-get update
21+apt-get install -y curl
22+
23+# Get Stack and GHC
24+curl -sSL https://get.haskellstack.org/ | sh -s - -d /usr/bin
25+stack setup --resolver ghc-$GHCVER
26+
1827apt-get update
1928apt-get install -y software-properties-common
2029
21−add-apt-repository ppa:hvr/ghc -y
2230add-apt-repository -y ppa:marutter/rrutter
2331apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
2432add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy main'
2533add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main'
2634add-apt-repository -y --keyserver hkp://keyserver.ubuntu.com:80 'deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main'
2735
28−GHCVER=8.6.3
29−
3036apt-get update
3137apt-get install -y \
3238 apt-transport-https \
@@ -38,10 +44,6 @@ apt-get install -y \
3844 fsharp \
3945 g++ \
4046 gawk \
41− ghc-$GHCVER \
42− ghc-$GHCVER-dyn \
43− ghc-$GHCVER-htmldocs \
44− ghc-$GHCVER-prof \
4547 git \
4648 gnupg \
4749 gradle \
@@ -164,11 +166,6 @@ ACCEPT_EULA=Y apt-get install msodbcsql17 -y
164166
165167locale-gen en_US.UTF-8
166168
167−curl -sSL https://get.haskellstack.org/ | sh
168−
169−# Put documentation where we expect it
170−mv /opt/ghc/$GHCVER/share/doc/ghc-$GHCVER/ /opt/ghc/$GHCVER/share/doc/ghc
171−
172169# llvm-5.0 for GHC (separate since it needs wget)
173170wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
174171 && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" \
@@ -304,3 +301,7 @@ export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-3.9/include;
304301# finally run:
305302ldconfig
306303# EOF: don't build anything below this line
304+
305+# Cleanup
306+apt-get clean
307+rm -rf /var/lib/apt/lists/*
etc/ci-script.sh+1−1
@@ -2,7 +2,7 @@
22
33set -euxo pipefail
44
5−export GHCVER=8.6.3
5+export GHCVER=8.6.4
66
77# Download and unpack the stack executable
88mkdir -p ~/.local/bin