Merge remote-tracking branch 'origin/master' into HEAD

CURATORS.md

@@ -283,28 +283,28 @@ we're just not there yet.
 /opt/stackage-build/stackage/automated/run-nightly.sh
 
 # Run an LTS minor bump
-/opt/stackage-build/stackage/automated/build.sh lts-2.17
+/opt/stackage-build/stackage/automated/build-next.sh lts-14.17
 
 # Run an LTS major bump
-/opt/stackage-build/stackage/automated/build.sh lts-3.0
+/opt/stackage-build/stackage/automated/build-next.sh lts-15.0
 ```
 
 Recommended: run these from inside a `tmux` session. If you get version bound
 problems on nightly or LTS major, you need to fix build-constraints.yaml (see
-info above). For an LTS minor bump, you'll typically want to use the
-`CONSTRAINTS` environment variable, e.g.:
+info above). 
 
-```
-CONSTRAINTS='--constraint "conduit < 1.4.5" --constraint "criterion < 1.2.3"' /opt/stackage-build/stackage/automated/build.sh lts-2.17
-```
+### Building LTS minor releases
+First run `build-next.sh` to regenerate updated `ltsXX/work/constraints.yaml` and `ltsXX/work/snapshot-incomplete.yaml` files.
 
-Valid arguments to include in this environment variable:
+For an LTS minor bump, you'll typically want to:
 
-* `--constraint` to modify an upper or lower bound
-* `--add-package` to add a brand new package
-* `--expect-test-failure` to expect tests to fail
-* `--expect-haddock-failure` to expect haddocks to fail
-* `--expect-bench-failure` to expect benchmarks to fail
+* Add constraints to package `range:` fields in that `constraints.yaml`.
+* Add new packages versioned to `snapshot-incomplete.yaml` (the `@<hash>` suffix is optional)
+* Test, benchmark, haddock failures can also be added to package fields in the `constraints.yaml` if necessary, though it should be avoided if possible for LTS.
+
+Then run `NOPLAN=1 build-next.sh` to build the generate an updated snapshot.
+
+This replaces `CONSTRAINTS=...' /opt/stackage-build/stackage/automated/build.sh lts-x.y` for the old curator-1.
 
 If a build fails for bounds reasons, see all of the advice above. If the code
 itself doesn't build, or tests fail, open up an issue and then either put in a
@@ -320,7 +320,7 @@ if one needs to revert one package, say due to a build or test regression,
 one can edit `current-plan.yaml` and updated the SHA256 hash of the .cabal file,
 to avoid having to rebuild everything again.)
 
-Note LTS builds inherit the current Hackage data (stack updated for Nigthly) to avoid excess extra rebuilding.
+_Sadly no longer true currently_: ~~Note LTS builds inherit the current Hackage data (stack updated for Nightly) to avoid excess extra rebuilding.~~
 
 ### Timing
 

Dockerfile

@@ -2,7 +2,7 @@ FROM fpco/pid1:18.04
 
 ENV HOME /home/stackage
 ENV LANG en_US.UTF-8
-ENV GHCVER 8.6.5
+ENV GHCVER 8.8.1
 
 # NOTE: also update debian-bootstrap.sh when cuda version changes
 ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin

README.md

@@ -126,4 +126,16 @@ trying to push out the bounds a bit farther.
 
 __What time are Stackage snapshots published?__
 
-Stackage Nightly and LTS are not released at a fixed time of day, they get pushed to stackage.org (and the metadata to the stackage-nightly and stackage-lts github repos) when their builds finish on the Stackage build server and the latest built haddocks have been synced over. This time varies greatly depending on build times for package updates, bounds breakage, problems with new packages being added and other build issues, etc. There are days when a release does not happen. LTS releases tend to happen over the weekend or early in the week.
+Stackage Nightly and LTS are not released at a fixed time of day, they get
+pushed to stackage.org (and the metadata to the stackage-nightly and
+stackage-lts github repos) when their builds finish on the Stackage build
+server and the latest built haddocks have been synced over. This time varies
+greatly depending on build times for package updates, bounds breakage,
+problems with new packages being added and other build issues, etc. There are
+days when a release does not happen. LTS releases tend to happen over the
+weekend or early in the week.
+
+__Where to get help regarding uploading packages?__
+
+Please ask on [Gitter](https://gitter.im/commercialhaskell/stackage) or open
+an issue or comment on the PR which uploads the package.

debian-bootstrap.sh

@@ -131,7 +131,7 @@ apt-get install -y \
     libzip-dev \
     libzstd-dev \
     libzmq3-dev \
-    llvm-6.0 \
+    llvm-7 \
     llvm-8 \
     locales \
     m4 \
@@ -183,9 +183,9 @@ update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10
 # This version is tracked here:
 # https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing
 #
-# GHC 8.6 requires LLVM 6.0 tools (specifically, llc-6.0 and opt-6.0).
-update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-6.0" 50
-update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-6.0" 50
+# GHC 8.8 requires LLVM 7 tools (?) (specifically, llc-7 and opt-7).
+update-alternatives --install "/usr/bin/llc" "llc" "/usr/bin/llc-7" 50
+update-alternatives --install "/usr/bin/opt" "opt" "/usr/bin/opt-7" 50
 
 # nodejs 10 (nodejs8 in bionic needs conflicting libssl10-dev)
 curl -sL https://deb.nodesource.com/setup_10.x | bash -
@@ -257,8 +257,8 @@ apt-add-repository multiverse \
     && apt-get update \
     && apt-get install -y nvidia-cuda-dev
 
-export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-6.0/lib;
-export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-6.0/include;
+export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-7/lib;
+export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-7/include;
 
 # protoc, for proto-lens-combinators test suite
 # Instructions from: https://google.github.io/proto-lens/installing-protoc.html

etc/ci-script.sh

@@ -2,7 +2,7 @@
 
 set -euxo pipefail
 
-export GHCVER=8.6.5
+export GHCVER=8.8.1
 
 # Download and unpack the stack executable
 mkdir -p ~/.local/bin