@@ -19,10 +19,8 @@ fi
1919
2020IMAGE=commercialhaskell/stackage:$TAG
2121
22−CABAL_DIR=$ROOT/cabal
2322PANTRY_DIR=$ROOT/pantry
24−STACK_DIR=$ROOT/stack-$TAG
25−GHC_DIR=$ROOT/ghc
23+STACK_DIR=$ROOT/stack
2624DOT_STACKAGE_DIR=$ROOT/dot-stackage
2725WORKDIR=$ROOT/$TAG/work
2826# ssh key is used for committing snapshots (and their constraints) to Github
@@ -30,10 +28,8 @@ SSH_DIR=$ROOT/ssh
3028USERID=$(id -u)
3129
3230mkdir -p \
33− "$CABAL_DIR" \
3431 "$PANTRY_DIR" \
3532 "$STACK_DIR" \
36− "$GHC_DIR" \
3733 "$DOT_STACKAGE_DIR" \
3834 "$WORKDIR" \
3935 "$SSH_DIR"
@@ -63,14 +59,16 @@ require_400_file "$HACKAGE_CREDS"
6359mkdir -p $ROOT/bin
6460BINDIR=$(cd $ROOT/bin ; pwd)
6561(
66−# See etc/curator-exes/README.md
67−CURATOR_EXES=84f6e06e11e1bcdab6ec1a302d40213e406748e64ae455bd4ed09a205651a7fd
6862cd $BINDIR
6963rm -f curator stack *.bz2
70−wget "https://s3.amazonaws.com/download.fpcomplete.com/curator-exes/curator-exes-$CURATOR_EXES.tar.bz2"
71−tar xf "curator-exes-$CURATOR_EXES.tar.bz2"
64+
65+curl "https://download.fpcomplete.com/stackage-curator-2/curator-85b021a53833ff310fc66b3fdc5ca3f7828ce18b.bz2" | bunzip2 > curator
66+chmod +x curator
7267echo -n "curator version: "
7368docker run --rm -v $(pwd)/curator:/exe $IMAGE /exe --version
69+
70+curl "https://download.fpcomplete.com/stackage-curator-2/stack-4033c93815477e5b565d9a2a61b54e04da0863ef.bz2" | bunzip2 > stack
71+chmod +x stack
7472echo -n "stack version: "
7573docker run --rm -v $(pwd)/stack:/exe $IMAGE /exe --version
7674)
@@ -79,11 +77,11 @@ docker run --rm -v $(pwd)/stack:/exe $IMAGE /exe --version
7977# is stored separately (because e.g. Ubuntu releases between LTS and nightly
8078# could differ). Also the order of binds is important.
8179ARGS_COMMON="--rm -v $WORKDIR:$HOME/work -w $HOME/work -v $BINDIR/curator:/usr/bin/curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro -v $BINDIR/stack:/usr/bin/stack:ro -v $STACK_DIR:$HOME/.stack -v $PANTRY_DIR:$HOME/.stack/pantry"
82−ARGS_PREBUILD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $CABAL_DIR:$HOME/.cabal -v $GHC_DIR:$HOME/.ghc -v $DOT_STACKAGE_DIR:$HOME/.stackage"
83−ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:$HOME/.cabal:ro -v $GHC_DIR:$HOME/.ghc:ro"
80+ARGS_PREBUILD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $DOT_STACKAGE_DIR:$HOME/.stackage"
81+ARGS_BUILD="$ARGS_COMMON"
8482# instance-data is an undocumented feature of S3 used by amazonka,
8583# see https://github.com/brendanhay/amazonka/issues/271
86−ARGS_UPLOAD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:$HOME/.stackage -v $SSH_DIR:$HOME/.ssh:ro -v $GITCONFIG:$HOME/.gitconfig:ro -v $CABAL_DIR:$HOME/.cabal:ro -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY"
84+ARGS_UPLOAD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:$HOME/.stackage -v $SSH_DIR:$HOME/.ssh:ro -v $GITCONFIG:$HOME/.gitconfig:ro -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY"
8785
8886# Make sure we actually need this snapshot. We only check this for LTS releases
8987# since, for nightlies, we'd like to run builds even if they are unnecessary to
@@ -139,9 +137,10 @@ docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "exec curator check-target-available
139137#
140138# * Upload the docs to S3
141139# * Upload the new snapshot .yaml file to the appropriate Github repo, also upload its constraints
142−# * Register as a new Hackage distro (currently disabled)
143−docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "curator upload-docs --target $TARGET && curator upload-github --target $TARGET && exec curator hackage-distro --target $TARGET"
144−# information about the new snapshots on Hackage
140+docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "curator upload-docs --target $TARGET && curator upload-github --target $TARGET"
141+
142+# For some reason, registering on Hackage fails with inscrutable error messages. Disabling.
143+# docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "exec curator hackage-distro --target $TARGET"
145144
146145$BINDIR/curator legacy-bulk --stackage-snapshots dot-stackage/curator/stackage-snapshots/ --lts-haskell dot-stackage/curator/lts-haskell/ --stackage-nightly dot-stackage/curator/stackage-nightly/
147146