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

This commit is contained in:
Adam Bergmark 2021-06-16 22:25:36 +02:00
commit 3b05f1b558
3 changed files with 685 additions and 559 deletions

View File

@ -239,7 +239,7 @@ For a new GHC version you should also delete the ~~cache~~ .stack-work snapshot
``` ```
# for example # for example
SNAP_SERIES=nightly # or lts16 SNAP_SERIES=nightly # or lts16
OLD_GHCVER=8.10.1 OLD_GHCVER=8.10.1
rm -r work/$SNAP_SERIES/unpack-dir/.stack-work/install/x86_64-linux/*/$OLD_GHCVER/ rm -r work/$SNAP_SERIES/unpack-dir/.stack-work/install/x86_64-linux/*/$OLD_GHCVER/
``` ```
@ -343,7 +343,7 @@ LTS minor bumps typically are run on Sundays.
* You can detect the problem by running `df`. If you see that `/` is out of space, we have a problem. * You can detect the problem by running `df`. If you see that `/` is out of space, we have a problem.
* If you see that `/var/stackage/` is out of space, you can: * If you see that `/var/stackage/` is out of space, you can:
* run `./etc/diskspace/clean-old-stack-libs.sh [nightly|lts-XX]` * run `./etc/diskspace/clean-old-stack-libs.sh [nightly|lts-XX]`
* If that is insufficient then remove all the old builds under the previous ghc/Cabal version: * If that is insufficient then remove all the old builds under the previous ghc/Cabal version:
* `rm -r /var/stackage/stackage/automated/work/[nightly|lts-XX]/unpack-dir/unpacked/*/.stack-work/dist/x86_64-linux/Cabal-X.Y.0.0/` * `rm -r /var/stackage/stackage/automated/work/[nightly|lts-XX]/unpack-dir/unpacked/*/.stack-work/dist/x86_64-linux/Cabal-X.Y.0.0/`
optionally (not recommended?): optionally (not recommended?):
@ -447,7 +447,7 @@ Every 3-6 months, we make a new major release of LTS. The procedure we follow fo
relaxed upper bounds. There will likely be some hard decisions to be made relaxed upper bounds. There will likely be some hard decisions to be made
regarding relaxing a bound versus keeping more packages. All of these changes regarding relaxing a bound versus keeping more packages. All of these changes
occur on master and affect nightly. occur on master and affect nightly.
4. Once the estimated date hits, push a new `lts-XX` branch and trigger Docker 4. Once the estimated date hits, push a new `ltsXX` branch and trigger Docker
Hub to build a Docker image for the new release. Hub to build a Docker image for the new release.
5. Run the build procedure for the new LTS release. 5. Run the build procedure for the new LTS release.
6. After the LTS build completes, more aggressively prune upper bounds from 6. After the LTS build completes, more aggressively prune upper bounds from

View File

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

File diff suppressed because it is too large Load Diff