diff options
Diffstat (limited to 'aux/ci/ci-build.sh')
-rwxr-xr-x | aux/ci/ci-build.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh index 17e9e37..34233b7 100755 --- a/aux/ci/ci-build.sh +++ b/aux/ci/ci-build.sh @@ -8,7 +8,8 @@ FILENAME="$(date -Is)-$SHA.log" LOGFILE="$LOGS_DIR/$FILENAME" mkdtemp() { - name="$(echo 'mkstemp(template)' | m4 -D template="${TMPDIR:-/tmp}/m4-tmpname.")" + name="$(echo 'mkstemp(template)' | + m4 -D template="${TMPDIR:-/tmp}/m4-tmpname.")" rm -f "$name" mkdir "$name" echo "$name" @@ -37,7 +38,8 @@ EOF sh aux/ci/report.sh -n "$PROJECT" -o public rsync -av public/ "/srv/http/$PROJECT/" --delete - printf "\n>>>\n>>> CI logs added as Git note.\n>>>\n>>> Run status was %s\n\n" "$STATUS" + printf '\n>>>\n>>> CI logs added as Git note.\n>>>\n>>> Run status was %s\n>>>\n\n' \ + "$STATUS" } trap finish EXIT @@ -47,10 +49,9 @@ EOF git clone "$REMOTE" . git config --global user.email git@euandre.org git config --global user.name 'EuAndreh CI' - git annex get ||: - if [ -f aux/guix/with-container.sh ]; then - RUNNER='sh aux/guix/with-container.sh' + if [ -e aux/with-container ]; then + RUNNER='sh aux/with-container' else RUNNER='sh -c' fi |