diff options
| author | EuAndreh <eu@euandre.org> | 2021-07-16 00:15:58 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2021-07-16 09:00:33 -0300 |
| commit | 4a90c2f05e561b8bd0fccc9ed8c63d8e17bea5dc (patch) | |
| tree | 75b0d6d7d74bd53583d4a9aadf08c91484d933ca /aux | |
| parent | aux/workflow/styles.css, aux/ci/ci-build.sh: spaces -> tabs (diff) | |
| download | git-permalink-4a90c2f05e561b8bd0fccc9ed8c63d8e17bea5dc.tar.gz git-permalink-4a90c2f05e561b8bd0fccc9ed8c63d8e17bea5dc.tar.xz | |
aux/ci/: Move Git hook handling from ci-build.sh to git-post-receive.sh
BONUS: Log instruction to re-execute build.
Diffstat (limited to 'aux')
| -rwxr-xr-x | aux/ci/ci-build.sh | 4 | ||||
| -rwxr-xr-x | aux/ci/git-post-receive.sh | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh index af29697..069f3df 100755 --- a/aux/ci/ci-build.sh +++ b/aux/ci/ci-build.sh @@ -3,7 +3,7 @@ set -eux PROJECT="$1" LOGS_DIR="$2" -read -r _ SHA _ # oldrev newrev refname +SHA="$3" FILENAME="$(date -Is)-$SHA.log" LOGFILE="$LOGS_DIR/$FILENAME" @@ -36,7 +36,7 @@ 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" "$STATUS" + printf "\n>>>\n>>> CI logs added as Git note.\n>>>\n>>> Run status was %s\n\n" "$STATUS" } trap finish EXIT diff --git a/aux/ci/git-post-receive.sh b/aux/ci/git-post-receive.sh index 167ac4a..855fd45 100755 --- a/aux/ci/git-post-receive.sh +++ b/aux/ci/git-post-receive.sh @@ -9,6 +9,11 @@ for n in $(seq 0 $((GIT_PUSH_OPTION_COUNT - 1))); do fi done +read -r _ SHA _ # oldrev newrev refname + PROJECT="$(basename "$PWD" | cut -d. -f1)" # remove .git suffix LOGS_DIR="/opt/ci/$PROJECT/logs" -"/opt/ci/$PROJECT/ci-build.sh" "$PROJECT" "$LOGS_DIR" +"/opt/ci/$PROJECT/ci-build.sh" "$PROJECT" "$LOGS_DIR" "$SHA" + +echo 'To retrigger the build, run:' +echo "cd /srv/git/$PROJECT.git/ && sh /opt/ci/$PROJECT/ci-build.sh" "$PROJECT" "$LOGS_DIR" "$SHA" |