From dfb0785155b50d78c1a438acd6978bd05b893489 Mon Sep 17 00:00:00 2001 From: Stackage Build host Date: Tue, 5 Jan 2016 05:51:39 +0000 Subject: [PATCH] Share ssh dir for multiple LTS builds --- automated/build.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 0f1d0855..acb9b302 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -7,10 +7,12 @@ TARGET=$1 # For nightly-YYYY-MM-DD, tag should be nightly # For lts-X.Y, tag should be ltsX -TAG=$(echo $TARGET | cut -d- -f 1) -if [ $TAG = "lts" ] +SHORTNAME=$(echo $TARGET | cut -d- -f 1) +if [ $SHORTNAME = "lts" ] then TAG=$(echo $TARGET | sed 's@^lts-\([0-9]*\)\.[0-9]*@lts\1@') +else + TAG=$SHORTNAME fi IMAGE=snoyberg/stackage:$TAG @@ -23,7 +25,7 @@ CABAL_DIR=$ROOT/cabal GHC_DIR=$ROOT/ghc DOT_STACKAGE_DIR=$ROOT/dot-stackage WORKDIR=$ROOT/$TAG/work -SSH_DIR=$ROOT/ssh-$TAG +SSH_DIR=$ROOT/ssh-$SHORTNAME mkdir -p \ "$CABAL_DIR" \