aboutsummaryrefslogtreecommitdiff
path: root/aux
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xaux/assert-shellcheck.sh (renamed from build-aux/assert-shellcheck.sh)0
-rwxr-xr-xaux/ci/ci-build.sh (renamed from build-aux/ci/ci-build.sh)4
-rwxr-xr-xaux/ci/git-post-receive.sh (renamed from build-aux/ci/git-post-receive.sh)0
-rwxr-xr-xaux/ci/git-pre-push.sh (renamed from build-aux/ci/git-pre-push.sh)4
-rw-r--r--aux/guix/manifest.scm (renamed from build-aux/guix/manifest.scm)0
-rw-r--r--aux/guix/pinned-channels.scm (renamed from build-aux/guix/pinned-channels.scm)0
-rwxr-xr-xaux/guix/with-container.sh4
-rwxr-xr-xaux/workflow/TODOs.sh (renamed from build-aux/workflow/TODOs.sh)4
-rwxr-xr-xaux/workflow/assert-todos.sh (renamed from build-aux/workflow/assert-todos.sh)2
-rw-r--r--aux/workflow/preamble.md (renamed from build-aux/workflow/preamble.md)0
-rw-r--r--aux/workflow/style.css (renamed from build-aux/workflow/style.css)0
11 files changed, 11 insertions, 7 deletions
diff --git a/build-aux/assert-shellcheck.sh b/aux/assert-shellcheck.sh
index 334a875..334a875 100755
--- a/build-aux/assert-shellcheck.sh
+++ b/aux/assert-shellcheck.sh
diff --git a/build-aux/ci/ci-build.sh b/aux/ci/ci-build.sh
index 0b792df..c891d3b 100755
--- a/build-aux/ci/ci-build.sh
+++ b/aux/ci/ci-build.sh
@@ -35,8 +35,8 @@ EOF
git config --global user.email git@euandre.org
git config --global user.name 'EuAndreh CI'
- if [ -f build-aux/guix/with-container.sh ]; then
- RUNNER='./build-aux/guix/with-container.sh'
+ if [ -f aux/guix/with-container.sh ]; then
+ RUNNER='./aux/guix/with-container.sh'
else
RUNNER='sh -c'
fi
diff --git a/build-aux/ci/git-post-receive.sh b/aux/ci/git-post-receive.sh
index 2f6e3c0..2f6e3c0 100755
--- a/build-aux/ci/git-post-receive.sh
+++ b/aux/ci/git-post-receive.sh
diff --git a/build-aux/ci/git-pre-push.sh b/aux/ci/git-pre-push.sh
index 2d2bcb1..30d2850 100755
--- a/build-aux/ci/git-pre-push.sh
+++ b/aux/ci/git-pre-push.sh
@@ -15,5 +15,5 @@ fi
scp "$DESCRIPTION" "git.euandreh.xyz:$REMOTE_GIT_DIR/description"
ssh git.euandreh.xyz mkdir -p "$LOGS_DIR"
-scp build-aux/ci/ci-build.sh "git.euandreh.xyz:$(dirname "$LOGS_DIR")/ci-build.sh"
-scp build-aux/ci/git-post-receive.sh "git.euandreh.xyz:$REMOTE_GIT_DIR/hooks/post-receive"
+scp aux/ci/ci-build.sh "git.euandreh.xyz:$(dirname "$LOGS_DIR")/ci-build.sh"
+scp aux/ci/git-post-receive.sh "git.euandreh.xyz:$REMOTE_GIT_DIR/hooks/post-receive"
diff --git a/build-aux/guix/manifest.scm b/aux/guix/manifest.scm
index 0c8a225..0c8a225 100644
--- a/build-aux/guix/manifest.scm
+++ b/aux/guix/manifest.scm
diff --git a/build-aux/guix/pinned-channels.scm b/aux/guix/pinned-channels.scm
index 67b5a51..67b5a51 100644
--- a/build-aux/guix/pinned-channels.scm
+++ b/aux/guix/pinned-channels.scm
diff --git a/aux/guix/with-container.sh b/aux/guix/with-container.sh
new file mode 100755
index 0000000..db7b121
--- /dev/null
+++ b/aux/guix/with-container.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -eux
+
+guix time-machine -C aux/guix/pinned-channels.scm -- environment --pure -C -m aux/guix/manifest.scm -- sh -c "$@"
diff --git a/build-aux/workflow/TODOs.sh b/aux/workflow/TODOs.sh
index 3f9fa4b..ab45835 100755
--- a/build-aux/workflow/TODOs.sh
+++ b/aux/workflow/TODOs.sh
@@ -9,7 +9,7 @@ export MAILING_LIST="$3"
REGEX='s/^## (TODO|DOING|WAITING|MEETING|INACTIVE|NEXT|CANCELLED|DONE) (.*) \{#(.*?)\}$/## <a href="#\3"><span class="\1">\1<\/span> \2<\/a>\n<span class="header-anchor" id="\3">#\3<\/span>\n/'
-envsubst < build-aux/workflow/preamble.md | \
+envsubst < aux/workflow/preamble.md | \
printf '%s\n\n%s' "$(cat -)" "$(perl -pe "$REGEX" TODOs.md)" | \
pandoc --toc \
--highlight-style pygments \
@@ -19,5 +19,5 @@ envsubst < build-aux/workflow/preamble.md | \
--metadata lang=en \
-r markdown \
-w html \
- -H build-aux/workflow/style.css \
+ -H aux/workflow/style.css \
> public/TODOs.html
diff --git a/build-aux/workflow/assert-todos.sh b/aux/workflow/assert-todos.sh
index 1d568cb..203d465 100755
--- a/build-aux/workflow/assert-todos.sh
+++ b/aux/workflow/assert-todos.sh
@@ -1,7 +1,7 @@
#!/bin/sh
set -eu
-if git grep FIXME | grep -v '^TODOs.md' | grep -v '^build-aux/workflow/assert-todos.sh' | grep -v '^build-aux/docbook-xsl/'; then
+if git grep FIXME | grep -v '^TODOs.md' | grep -v '^aux/workflow/assert-todos.sh' | grep -v '^aux/docbook-xsl/'; then
echo "Found dangling FIXME markers on the project."
echo "You should write them down properly on TODOs.md."
exit 1
diff --git a/build-aux/workflow/preamble.md b/aux/workflow/preamble.md
index c6ae56e..c6ae56e 100644
--- a/build-aux/workflow/preamble.md
+++ b/aux/workflow/preamble.md
diff --git a/build-aux/workflow/style.css b/aux/workflow/style.css
index ac0144c..ac0144c 100644
--- a/build-aux/workflow/style.css
+++ b/aux/workflow/style.css