diff options
Diffstat (limited to 'aux/ci')
| -rwxr-xr-x | aux/ci/ci-build.sh | 6 | ||||
| -rwxr-xr-x | aux/ci/git-pre-push.sh | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh index 4214ae2..b6769a9 100755 --- a/aux/ci/ci-build.sh +++ b/aux/ci/ci-build.sh @@ -25,6 +25,10 @@ EOF git notes --ref=refs/notes/ci-logs add -f -F "$LOGFILE" git notes append -m "$NOTE" + cd - + sh aux/ci/report.sh "$PACKAGE" + rsync -a public/ "/srv/http/$PACKAGE/" --delete + printf "\n>>>\n>>> CI logs added as Git note.\n>>>\n>>> Run status was %s" "$STATUS" } trap finish EXIT @@ -45,6 +49,4 @@ EOF fi $RUNNER 'make clean public dev-check' - - rsync -a public/ "/srv/http/$PACKAGE/" --delete } 2>&1 | tee "$LOGFILE" diff --git a/aux/ci/git-pre-push.sh b/aux/ci/git-pre-push.sh index 5a7ca0b..e73b9b8 100755 --- a/aux/ci/git-pre-push.sh +++ b/aux/ci/git-pre-push.sh @@ -1,6 +1,8 @@ #!/bin/sh set -eux +TLD="$(cat aux/tld.txt)" + PACKAGE="$(basename "$PWD")" LOGS_DIR="/opt/ci/$PACKAGE/logs" REMOTE_GIT_DIR="/srv/git/$PACKAGE.git" @@ -13,7 +15,7 @@ else git config euandreh.description > "$DESCRIPTION" fi -scp "$DESCRIPTION" "git.euandreh.xyz:$REMOTE_GIT_DIR/description" -ssh git.euandreh.xyz mkdir -p "$LOGS_DIR" -scp aux/ci/ci-build.sh "git.euandreh.xyz:$(dirname "$LOGS_DIR")/ci-build.sh" -scp aux/ci/git-post-receive.sh "git.euandreh.xyz:$REMOTE_GIT_DIR/hooks/post-receive" +scp "$DESCRIPTION" "$TLD:$REMOTE_GIT_DIR/description" +ssh "$TLD" mkdir -p "$LOGS_DIR" +scp aux/ci/ci-build.sh "$TLD:$(dirname "$LOGS_DIR")/ci-build.sh" +scp aux/ci/git-post-receive.sh "$TLD:$REMOTE_GIT_DIR/hooks/post-receive" |