diff options
| author | EuAndreh <eu@euandre.org> | 2020-11-29 19:25:22 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2020-11-29 19:48:56 -0300 |
| commit | 9a7ac6fa741388386467218d557e690f3ad8f3b7 (patch) | |
| tree | 6c3858195908535fb515ee74c1af299344d01d58 | |
| parent | vps.scm: Inline id_rsa.pub file (diff) | |
| download | toph-9a7ac6fa741388386467218d557e690f3ad8f3b7.tar.gz toph-9a7ac6fa741388386467218d557e690f3ad8f3b7.tar.xz | |
ci-build.sh: Remove server-specific PREFIX path of logfile
| -rwxr-xr-x | guix-reconfigure.sh | 2 | ||||
| -rwxr-xr-x | scripts/ci-build.sh | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/guix-reconfigure.sh b/guix-reconfigure.sh index 888879d..868b2cd 100755 --- a/guix-reconfigure.sh +++ b/guix-reconfigure.sh @@ -4,5 +4,5 @@ cd "$(dirname "${BASH_SOURCE[0]}")" set -x rsync -avzzP sync/ "$TLD:~/" -ssh "$TLD" guix pull +# ssh "$TLD" guix pull ssh "$TLD" sudo guix system reconfigure vps.scm diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 5d5734b..277fb69 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -2,9 +2,11 @@ set -Eeuo pipefail set -x +PREFIX='/srv/ci/vps' +mkdir -p "$PREFIX" read -r _ SHA _ # oldrev newrev refname -LOGFILE="/srv/ci/vps/$(date -Is)-$SHA.log" -mkdir -p "$(dirname "$LOGFILE")" +FILENAME="$(date -Is)-$SHA.log" +LOGFILE="$PREFIX/$FILENAME" exec &> >(tee -a "$LOGFILE") echo "Starting CI job at: $(date -Is)" @@ -20,7 +22,7 @@ See CI logs with: git notes --ref=refs/notes/ci-data show $SHA EOF ) - git notes --ref=refs/notes/ci-data add -f -m "$STATUS $LOGFILE" + git notes --ref=refs/notes/ci-data add -f -m "$STATUS $FILENAME" git notes --ref=refs/notes/ci-logs add -f -F "$LOGFILE" git notes add -f -m "$NOTE" printf "\n\n>>> CI logs added as Git note." |