diff options
| author | EuAndreh <eu@euandre.org> | 2021-07-16 00:37:50 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2021-07-16 09:00:34 -0300 |
| commit | 2c8af55f390108a9cca51fb91c0d1e21e000f8e6 (patch) | |
| tree | 21c2fe340dba44789ad4a089faf245349ef58035 /aux | |
| parent | aux/ci/: Move Git hook handling from ci-build.sh to git-post-receive.sh (diff) | |
| download | git-permalink-2c8af55f390108a9cca51fb91c0d1e21e000f8e6.tar.gz git-permalink-2c8af55f390108a9cca51fb91c0d1e21e000f8e6.tar.xz | |
aux/ci/: Run sh files with sh instead of ./
Diffstat (limited to 'aux')
| -rwxr-xr-x | aux/ci/ci-build.sh | 2 | ||||
| -rwxr-xr-x | aux/ci/git-post-receive.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh index 069f3df..f766d6a 100755 --- a/aux/ci/ci-build.sh +++ b/aux/ci/ci-build.sh @@ -50,7 +50,7 @@ EOF git annex get ||: if [ -f aux/guix/with-container.sh ]; then - RUNNER='./aux/guix/with-container.sh' + RUNNER='sh aux/guix/with-container.sh' else RUNNER='sh -c' fi diff --git a/aux/ci/git-post-receive.sh b/aux/ci/git-post-receive.sh index 855fd45..24f40ef 100755 --- a/aux/ci/git-post-receive.sh +++ b/aux/ci/git-post-receive.sh @@ -13,7 +13,8 @@ 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" "$SHA" +sh "/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" +echo "cd /srv/git/$PROJECT.git/" +echo "sh /opt/ci/$PROJECT/ci-build.sh" "$PROJECT" "$LOGS_DIR" "$SHA" |