Merge pull request #4360 from qrilka/proper-pruning

Use more correct pruning done in commercialhaskell/stack/pull/4547
This commit is contained in:
Dan Burton 2019-04-13 17:29:02 -07:00 committed by GitHub
commit a05d88c3b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions

View File

@ -61,7 +61,7 @@ BINDIR=$(cd $ROOT/bin ; pwd)
(
cd $BINDIR
rm -f stackage-curator stackage-curator-2*.bz2
CURATOR2=stackage-curator-2-401883a889b06e0a2ac772fac7abcc743d5a00e2
CURATOR2=stackage-curator-2-7e65b644121812d9a3a8b24d7130bb8865485f8f
wget "https://download.fpcomplete.com/stackage-curator-2/$CURATOR2.bz2"
bunzip2 "$CURATOR2.bz2"
chmod +x $CURATOR2
@ -90,7 +90,7 @@ fi
(
cd $BINDIR
rm -f stack stack-*.bz2
STACK=stack-401883a889b06e0a2ac772fac7abcc743d5a00e2
STACK=stack-7e65b644121812d9a3a8b24d7130bb8865485f8f
wget "https://download.fpcomplete.com/stackage-curator-2/$STACK.bz2"
bunzip2 "$STACK.bz2"
chmod +x $STACK

View File

@ -2,19 +2,30 @@
set -euxo pipefail
ETC=$(cd $(dirname $0) ; pwd)
export GHCVER=$(sed -n "s/^ghc-version: \"\(.*\)\"/\1/p" "$ETC/../build-constraints.yaml")
# Download and unpack the stack executable
mkdir -p ~/.local/bin
export PATH=$HOME/.local/bin:$PATH
curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
# Get new Stackage curator
CURATOR2=stackage-curator-2-90cf65bfddea4e8abb5bc68fe83d59a7f8766757
wget "https://s3.amazonaws.com/www.snoyman.com/stackage-curator-2/$CURATOR2.bz2"
CURATOR2=stackage-curator-2-7e65b644121812d9a3a8b24d7130bb8865485f8f
wget "https://download.fpcomplete.com/stackage-curator-2/$CURATOR2.bz2"
bunzip2 "$CURATOR2.bz2"
chmod +x $CURATOR2
mv $CURATOR2 ~/.local/bin/stackage-curator-2
# Install GHC
stack setup $GHCVER
# curator's constraint command has target as a required parameter
# because of a different constraints handling in minor LTS version bumps
NIGHTLY="nightly-$(date +%Y-%m-%d)"
# New curator check
stackage-curator-2 update &&
stackage-curator-2 constraints &&
stackage-curator-2 snapshotincomplete &&
stackage-curator-2 constraints --target=$NIGHTLY &&
stackage-curator-2 snapshot-incomplete &&
stackage-curator-2 snapshot &&
stackage-curator-2 checksnapshot
stack --resolver ghc-$GHCVER exec stackage-curator-2 check-snapshot