From 85165af5c5ae9984ef40182c2372afafa55e54a9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 11 Oct 2024 18:46:11 +0200 Subject: [PATCH] run-nightly.sh now passes command arg to build.sh; fix -n test [skip ci] --- automated/build.sh | 2 +- automated/run-nightly.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index adb4db9b..620d2bd3 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -104,7 +104,7 @@ ARGS_BUILD="$ARGS_COMMON" ARGS_UPLOAD="$ARGS_COMMON -u $USERID -e HOME=$C_HOME -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:$C_HOME/.stackage -v $SSH_DIR:$C_HOME/.ssh:ro -v $GITCONFIG:$C_HOME/.gitconfig:ro -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY ${AWS_ENDPOINT_URL:+-e AWS_ENDPOINT_URL=$AWS_ENDPOINT_URL} -v $DOT_STACKAGE_DIR:/dot-stackage" # for debugging etc -if [ -n = "${2:-}" ] +if [ -n "${2:-}" ] then docker run -it $ARGS_UPLOAD $IMAGE $2 exit 0 diff --git a/automated/run-nightly.sh b/automated/run-nightly.sh index 27e609df..cc2fab49 100755 --- a/automated/run-nightly.sh +++ b/automated/run-nightly.sh @@ -4,7 +4,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" while true; do git pull - ./build.sh nightly-$(date -u +%F) + ./build.sh nightly-$(date -u +%F) $1 date sleep 49m