diff options
Diffstat (limited to '')
| -rwxr-xr-x | build-aux/ci/ci-build.sh | 4 | ||||
| -rw-r--r-- | build-aux/guix/manifest.scm (renamed from guix/manifest.scm) | 0 | ||||
| -rw-r--r-- | build-aux/guix/pinned-channels.scm (renamed from guix/pinned-channels.scm) | 0 | ||||
| -rwxr-xr-x | build-aux/guix/with-container.sh | 4 | ||||
| -rwxr-xr-x | build-aux/with-container.sh | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/build-aux/ci/ci-build.sh b/build-aux/ci/ci-build.sh index b7a4c38..0b792df 100755 --- a/build-aux/ci/ci-build.sh +++ b/build-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/with-container.sh ]; then - RUNNER='./build-aux/with-container.sh' + if [ -f build-aux/guix/with-container.sh ]; then + RUNNER='./build-aux/guix/with-container.sh' else RUNNER='sh -c' fi diff --git a/guix/manifest.scm b/build-aux/guix/manifest.scm index 0c8a225..0c8a225 100644 --- a/guix/manifest.scm +++ b/build-aux/guix/manifest.scm diff --git a/guix/pinned-channels.scm b/build-aux/guix/pinned-channels.scm index 67b5a51..67b5a51 100644 --- a/guix/pinned-channels.scm +++ b/build-aux/guix/pinned-channels.scm diff --git a/build-aux/guix/with-container.sh b/build-aux/guix/with-container.sh new file mode 100755 index 0000000..5969d38 --- /dev/null +++ b/build-aux/guix/with-container.sh @@ -0,0 +1,4 @@ +#!/bin/sh +set -eux + +guix time-machine -C build-aux/guix/pinned-channels.scm -- environment --pure -C -m build-aux/guix/manifest.scm -- sh -c "$@" diff --git a/build-aux/with-container.sh b/build-aux/with-container.sh deleted file mode 100755 index 5544d8e..0000000 --- a/build-aux/with-container.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -set -eux - -guix time-machine -C guix/pinned-channels.scm -- environment --pure -C -m guix/manifest.scm -- sh -c "$@" |