diff --git a/.cirrus.yml b/.cirrus.yml index 56f8a49..131cc47 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -34,4 +34,4 @@ task: build_script: - echo "sandbox = true" >> /etc/nix/nix.conf - export NIX_PATH="nixpkgs=$(nix eval --raw -f pkgs/nixpkgs-pinned.nix $nixpkgs)" - - nix run -f '' bash coreutils cachix -c ./ci/build.sh + - nix run -f '' bash coreutils cachix -c ./test/ci/build.sh diff --git a/ci/build-to-cachix.sh b/test/ci/build-to-cachix.sh similarity index 100% rename from ci/build-to-cachix.sh rename to test/ci/build-to-cachix.sh diff --git a/ci/build.sh b/test/ci/build.sh similarity index 90% rename from ci/build.sh rename to test/ci/build.sh index 3c3f2e1..dd04779 100755 --- a/ci/build.sh +++ b/test/ci/build.sh @@ -26,4 +26,4 @@ else testArgs=pkgsUnstable fi -"${BASH_SOURCE[0]%/*}/../test/run-tests.sh" --ci $testArgs +"${BASH_SOURCE[0]%/*}/../run-tests.sh" --ci --scenario $scenario diff --git a/test/run-tests.sh b/test/run-tests.sh index 649fd81..06ac514 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -199,7 +199,7 @@ doBuild() { name=$1 shift if [[ $ciBuild ]]; then - "$scriptDir/../ci/build-to-cachix.sh" "$@" + "$scriptDir/ci/build-to-cachix.sh" "$@" else if [[ $outLinkPrefix ]]; then outLink="--out-link $outLinkPrefix-$name"