on master help sign in
DOT_STACKAGE_DIR
commitfae208eba3789880327480fe0b133545f98973f5 authorMichael Snoyman <michael@snoyman.com> dateSun 10 May 2015, 16:28 (11 years ago) parent8896e1e
1 file changed+3−3
automated/build.sh+3−3
automated/build.sh+3−3
@@ -12,7 +12,7 @@ BUNDLE_FILE=current.bundle
1212CABAL_DIR=$ROOT/cabal
1313GHC_DIR=$ROOT/ghc
1414CURATOR_DIR=$ROOT/stackage-curator
15−UPDATE_DIR=$ROOT/stackage-update
15+DOT_STACKAGE_DIR=$ROOT/dot-stackage
1616WORKDIR=$TROOT/work
1717SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1)
1818
@@ -20,7 +20,7 @@ mkdir -p \
2020 "$CABAL_DIR" \
2121 "$GHC_DIR" \
2222 "$CURATOR_DIR" \
23− "$UPDATE_DIR" \
23+ "$DOT_STACKAGE_DIR" \
2424 "$WORKDIR" \
2525 "$SSH_DIR"
2626
@@ -64,7 +64,7 @@ chmod +x stackage-curator
6464)
6565
6666ARGS_COMMON="--rm -u $USER -v $WORKDIR:/home/stackage/work -w /home/stackage/work -v $BINDIR/stackage-curator:/usr/local/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro"
67−ARGS_PREBUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal -v $GHC_DIR:/home/stackage/.ghc -v $UPDATE_DIR:/home/stackage/.stackage-update"
67+ARGS_PREBUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal -v $GHC_DIR:/home/stackage/.ghc -v $DOT_STACKAGE_DIR:/home/stackage/.stackage"
6868ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/home/stackage/.ghc:ro"
6969ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $CURATOR_DIR:/home/stackage/.stackage-curator -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro"
7070