git.iko.soy/stackage
on master help sign in
Merge pull request #4360 from qrilka/proper-pruning

Use more correct pruning done in commercialhaskell/stack/pull/4547

commita05d88c3b70bcb2912828f0e058d56d510e08796 authorDan Burton <danburton.email@gmail.com> dateSat 13 Apr 2019, 17:29 (8 years ago) parentae60748ab38297
2 files changed+18−7
compare with master
unifiedsplit
automated/build-next.sh+2−2 etc/curator-2-check.sh+16−5
automated/build-next.sh+2−2
@@ -61,7 +61,7 @@ BINDIR=$(cd $ROOT/bin ; pwd)
6161(
6262cd $BINDIR
6363rm -f stackage-curator stackage-curator-2*.bz2
64−CURATOR2=stackage-curator-2-401883a889b06e0a2ac772fac7abcc743d5a00e2
64+CURATOR2=stackage-curator-2-7e65b644121812d9a3a8b24d7130bb8865485f8f
6565wget "https://download.fpcomplete.com/stackage-curator-2/$CURATOR2.bz2"
6666bunzip2 "$CURATOR2.bz2"
6767chmod +x $CURATOR2
@@ -90,7 +90,7 @@ fi
9090(
9191cd $BINDIR
9292rm -f stack stack-*.bz2
93−STACK=stack-401883a889b06e0a2ac772fac7abcc743d5a00e2
93+STACK=stack-7e65b644121812d9a3a8b24d7130bb8865485f8f
9494wget "https://download.fpcomplete.com/stackage-curator-2/$STACK.bz2"
9595bunzip2 "$STACK.bz2"
9696chmod +x $STACK
etc/curator-2-check.sh+16−5
@@ -2,19 +2,30 @@
22
33set -euxo pipefail
44
5+ETC=$(cd $(dirname $0) ; pwd)
6+export GHCVER=$(sed -n "s/^ghc-version: \"\(.*\)\"/\1/p" "$ETC/../build-constraints.yaml")
7+
8+# Download and unpack the stack executable
59mkdir -p ~/.local/bin
610export PATH=$HOME/.local/bin:$PATH
11+curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
712
813# Get new Stackage curator
9−CURATOR2=stackage-curator-2-90cf65bfddea4e8abb5bc68fe83d59a7f8766757
10−wget "https://s3.amazonaws.com/www.snoyman.com/stackage-curator-2/$CURATOR2.bz2"
14+CURATOR2=stackage-curator-2-7e65b644121812d9a3a8b24d7130bb8865485f8f
15+wget "https://download.fpcomplete.com/stackage-curator-2/$CURATOR2.bz2"
1116bunzip2 "$CURATOR2.bz2"
1217chmod +x $CURATOR2
1318mv $CURATOR2 ~/.local/bin/stackage-curator-2
1419
20+# Install GHC
21+stack setup $GHCVER
22+
23+# curator's constraint command has target as a required parameter
24+# because of a different constraints handling in minor LTS version bumps
25+NIGHTLY="nightly-$(date +%Y-%m-%d)"
1526# New curator check
1627stackage-curator-2 update &&
17− stackage-curator-2 constraints &&
18− stackage-curator-2 snapshotincomplete &&
28+ stackage-curator-2 constraints --target=$NIGHTLY &&
29+ stackage-curator-2 snapshot-incomplete &&
1930 stackage-curator-2 snapshot &&
20− stackage-curator-2 checksnapshot
31+ stack --resolver ghc-$GHCVER exec stackage-curator-2 check-snapshot