From 2a36d6a02495b06e8a597c60303ae7c5f81d5dfa Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 7 Feb 2021 22:51:44 -0300 Subject: Update aux/ files --- aux/ci/ci-build.sh | 6 +++--- aux/guix/with-container.sh | 12 +++++++++++- aux/workflow/TODOs.sh | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'aux') diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh index bff1216..81ee1fd 100755 --- a/aux/ci/ci-build.sh +++ b/aux/ci/ci-build.sh @@ -41,10 +41,10 @@ EOF RUNNER='sh -c' fi - if [ -f ./bootstrap ]; then - COMMAND='./bootstrap && ./configure && make clean all check distcheck public' + if [ -f ./configure ]; then + COMMAND='./configure && make clean check public' else - COMMAND='make clean check public' + COMMAND='make CC=cc clean check public' fi $RUNNER "$COMMAND" diff --git a/aux/guix/with-container.sh b/aux/guix/with-container.sh index db7b121..3e6a590 100755 --- a/aux/guix/with-container.sh +++ b/aux/guix/with-container.sh @@ -1,4 +1,14 @@ #!/bin/sh set -eux -guix time-machine -C aux/guix/pinned-channels.scm -- environment --pure -C -m aux/guix/manifest.scm -- sh -c "$@" +if [ -z "${1:-}" ]; then + guix time-machine -C aux/guix/pinned-channels.scm -- \ + environment --pure -C -m aux/guix/manifest.scm +elif [ "$1" = '-i' ]; then + guix time-machine -C aux/guix/pinned-channels.scm -- \ + environment -m aux/guix/manifest.scm +else + guix time-machine -C aux/guix/pinned-channels.scm -- \ + environment --pure -C -m aux/guix/manifest.scm -- \ + sh -c "$@" +fi diff --git a/aux/workflow/TODOs.sh b/aux/workflow/TODOs.sh index ab45835..5dbc761 100755 --- a/aux/workflow/TODOs.sh +++ b/aux/workflow/TODOs.sh @@ -17,7 +17,7 @@ envsubst < aux/workflow/preamble.md | \ -s \ --metadata title="$PROJECT_UC - TODOs" \ --metadata lang=en \ - -r markdown \ + -r commonmark \ -w html \ -H aux/workflow/style.css \ > public/TODOs.html -- cgit v1.2.3