From c98d6c8175a1b2fe4452990b6ac19346411b637d Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Thu, 13 Jan 2022 15:02:40 -0300 Subject: aux/: Update --- aux/ci/ci-build.sh | 11 ++++---- aux/ci/git-post-receive.sh | 3 ++- aux/ci/report.sh | 66 ++++++++++++++++++++++++++++------------------ 3 files changed, 48 insertions(+), 32 deletions(-) (limited to 'aux/ci') 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 diff --git a/aux/ci/git-post-receive.sh b/aux/ci/git-post-receive.sh index 426bff3..92bba73 100755 --- a/aux/ci/git-post-receive.sh +++ b/aux/ci/git-post-receive.sh @@ -4,7 +4,8 @@ set -eu for n in $(seq 0 $((GIT_PUSH_OPTION_COUNT - 1))); do opt="$(eval "echo \$GIT_PUSH_OPTION_$n")" if [ "$opt" = skip-ci ] || [ "$opt" = ci-skip ]; then - printf "\n'%s' option detected, not running ci-build.sh\n\n" "$opt" + printf "\n'%s' option detected, not running ci-build.sh\n\n" \ + "$opt" exit 0 fi done diff --git a/aux/ci/report.sh b/aux/ci/report.sh index 1aa41a0..e900e26 100755 --- a/aux/ci/report.sh +++ b/aux/ci/report.sh @@ -41,30 +41,45 @@ for c in $(git notes list | cut -d\ -f2); do DATA="$(git notes --ref=refs/notes/ci-data show "$c")" FILENAME="$(echo "$DATA" | cut -d\ -f2)" echo "$DATA" > "$OUTDIR/ci-data/$FILENAME" - git notes --ref=refs/notes/ci-logs show "$c" > "$OUTDIR/ci-logs/$FILENAME" + git notes --ref=refs/notes/ci-logs show "$c" \ + > "$OUTDIR/ci-logs/$FILENAME" done -cat <> "$OUT" +{ + cat < - - - - - CI logs for $PROJECT - - - - -

- CI logs for $PROJECT -

-
    + + + + + + $PROJECT - CI logs + +EOF + + cat aux/workflow/style.css + + cat < + pre { + display: inline; + } + ol { + list-style-type: disc; + } + + + +
    +

    + CI logs for + $PROJECT +

    +
      EOF +} > "$OUT" for f in $(find "$OUTDIR/ci-data/" -type f | LANG=C.UTF-8 sort -r); do DATA="$(cat "$f")" @@ -78,17 +93,16 @@ for f in $(find "$OUTDIR/ci-data/" -type f | LANG=C.UTF-8 sort -r); do fi cat <> "$OUT" -
    1. - - $STATUS_MARKER 
      $FILENAME
      -       -
      2. +
    2. + $STATUS_MARKER 
      $FILENAME
       +
      3. EOF done cat <> "$OUT" -
- + + + EOF -- cgit v1.2.3