diff options
| author | EuAndreh <eu@euandre.org> | 2022-05-30 14:35:57 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2022-05-30 14:35:57 -0300 |
| commit | b3597c5e850a02e724f287b04a3701fe13d46fdc (patch) | |
| tree | 0fc6bad03680409b1cf56919ff1f5dd988339521 /aux/ci | |
| parent | Revert "src/xyz/euandreh/pending.scm: Ad quodlibet" (diff) | |
| download | package-repository-b3597c5e850a02e724f287b04a3701fe13d46fdc.tar.gz package-repository-b3597c5e850a02e724f287b04a3701fe13d46fdc.tar.xz | |
aux/: Update
Diffstat (limited to 'aux/ci')
| -rwxr-xr-x | aux/ci/ci-build.sh | 7 | ||||
| -rwxr-xr-x | aux/ci/git-post-receive.sh | 4 | ||||
| -rwxr-xr-x | aux/ci/git-pre-push.sh | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh index 8d18252..8d49779 100755 --- a/aux/ci/ci-build.sh +++ b/aux/ci/ci-build.sh @@ -36,9 +36,12 @@ EOF cd - git fetch origin refs/notes/*:refs/notes/* sh aux/ci/report.sh -n "$PROJECT" -o public - rsync -av public/ "/srv/http/$PROJECT/" + rsync -av public/ "/opt/www/$TLD/static/$PROJECT/" - tar -C /srv/http -cf /srv/http/"$PROJECT"/repo.tar.gz \ + tar \ + -C "/opt/www/$TLD/git/repos" \ + -c \ + -f "/opt/www/$TLD/static/$PROJECT/repo.tar.gz" \ "$PROJECT".git printf '\n>>>\n>>> CI logs added as Git note.\n>>>\n>>> Run status was %s\n>>>\n\n' \ diff --git a/aux/ci/git-post-receive.sh b/aux/ci/git-post-receive.sh index 92bba73..f813259 100755 --- a/aux/ci/git-post-receive.sh +++ b/aux/ci/git-post-receive.sh @@ -18,5 +18,5 @@ LOGS_DIR="/opt/ci/$PROJECT/logs" sh "/opt/ci/$PROJECT/ci-build.sh" "$PROJECT" "$LOGS_DIR" "$SHA" ||: echo 'To retrigger the build, run:' -echo "cd /srv/http/$PROJECT.git/" -echo "sh /opt/ci/$PROJECT/ci-build.sh" "$PROJECT" "$LOGS_DIR" "$SHA" +echo "cd /opt/www/$TLD/git/repos/$PROJECT.git/" +echo "sh /opt/www/$TLD/git/ci/$PROJECT/ci-build.sh" "$PROJECT" "$LOGS_DIR" "$SHA" diff --git a/aux/ci/git-pre-push.sh b/aux/ci/git-pre-push.sh index eaaa7bd..9883769 100755 --- a/aux/ci/git-pre-push.sh +++ b/aux/ci/git-pre-push.sh @@ -5,8 +5,8 @@ TLD="$(cat aux/tld.txt)" . aux/lib.sh PROJECT="$(basename "$PWD")" -LOGS_DIR="/opt/ci/$PROJECT/logs" -REMOTE_GIT_DIR="/srv/http/$PROJECT.git" +LOGS_DIR="/opt/www/$TLD/git/ci/$PROJECT/logs" +REMOTE_GIT_DIR="/opt/www/$TLD/git/repos/$PROJECT.git" DESCRIPTION="$(mkstemp)" if [ -f description ] |