diff options
Diffstat (limited to '')
-rwxr-xr-x | aux/ci/ci-build.sh | 12 | ||||
-rwxr-xr-x | aux/ci/git-post-receive.sh | 4 | ||||
-rwxr-xr-x | aux/ci/git-pre-push.sh | 2 |
3 files changed, 6 insertions, 12 deletions
diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh index 311abf9..1c033fe 100755 --- a/aux/ci/ci-build.sh +++ b/aux/ci/ci-build.sh @@ -28,7 +28,7 @@ EOF cd - if [ -f ./aux/ci/report.sh ]; then sh aux/ci/report.sh "$PACKAGE" - rsync -avzzP public/ "/srv/http/$PACKAGE/" --delete + rsync -avzzP public/ "/srv/http/$PACKAGE/" fi printf "\n>>>\n>>> CI logs added as Git note.\n>>>\n>>> Run status was %s" "$STATUS" @@ -50,13 +50,7 @@ EOF RUNNER='sh -c' fi - if [ -f ./configure ]; then - COMMAND='./configure && make CC=cc clean check public' - else - COMMAND='make CC=cc clean check public' - fi - - $RUNNER "$COMMAND" + $RUNNER 'make clean dev-check public' rsync -avzzP public/ "/srv/http/$PACKAGE/" --delete -} | tee "$LOGFILE" 2>&1 +} 2>&1 | tee "$LOGFILE" diff --git a/aux/ci/git-post-receive.sh b/aux/ci/git-post-receive.sh index b169489..f8986ed 100755 --- a/aux/ci/git-post-receive.sh +++ b/aux/ci/git-post-receive.sh @@ -10,5 +10,5 @@ for n in $(seq 0 $((GIT_PUSH_OPTION_COUNT - 1))); do done PACKAGE="$(basename "$PWD" | cut -d. -f1)" # remove .git suffix -LOGS_DIR="/srv/ci/$PACKAGE/logs" -"/srv/ci/$PACKAGE/ci-build.sh" "$PACKAGE" "$LOGS_DIR" +LOGS_DIR="/opt/ci/$PACKAGE/logs" +"/opt/ci/$PACKAGE/ci-build.sh" "$PACKAGE" "$LOGS_DIR" diff --git a/aux/ci/git-pre-push.sh b/aux/ci/git-pre-push.sh index d90a4b4..5546cb2 100755 --- a/aux/ci/git-pre-push.sh +++ b/aux/ci/git-pre-push.sh @@ -2,7 +2,7 @@ set -eux PACKAGE="$(basename "$PWD")" -LOGS_DIR="/srv/ci/$PACKAGE/logs" +LOGS_DIR="/opt/ci/$PACKAGE/logs" REMOTE_GIT_DIR="/srv/git/$PACKAGE.git" DESCRIPTION="$(mktemp)" |