move ci/ to test/

This commit is contained in:
Erik Arvstedt 2021-12-08 04:07:33 +01:00
parent eaf98f92db
commit 0fd3be5343
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
4 changed files with 3 additions and 3 deletions

View File

@ -34,4 +34,4 @@ task:
build_script: build_script:
- echo "sandbox = true" >> /etc/nix/nix.conf - echo "sandbox = true" >> /etc/nix/nix.conf
- export NIX_PATH="nixpkgs=$(nix eval --raw -f pkgs/nixpkgs-pinned.nix $nixpkgs)" - export NIX_PATH="nixpkgs=$(nix eval --raw -f pkgs/nixpkgs-pinned.nix $nixpkgs)"
- nix run -f '<nixpkgs>' bash coreutils cachix -c ./ci/build.sh - nix run -f '<nixpkgs>' bash coreutils cachix -c ./test/ci/build.sh

View File

@ -26,4 +26,4 @@ else
testArgs=pkgsUnstable testArgs=pkgsUnstable
fi fi
"${BASH_SOURCE[0]%/*}/../test/run-tests.sh" --ci $testArgs "${BASH_SOURCE[0]%/*}/../run-tests.sh" --ci --scenario $scenario

View File

@ -199,7 +199,7 @@ doBuild() {
name=$1 name=$1
shift shift
if [[ $ciBuild ]]; then if [[ $ciBuild ]]; then
"$scriptDir/../ci/build-to-cachix.sh" "$@" "$scriptDir/ci/build-to-cachix.sh" "$@"
else else
if [[ $outLinkPrefix ]]; then if [[ $outLinkPrefix ]]; then
outLink="--out-link $outLinkPrefix-$name" outLink="--out-link $outLinkPrefix-$name"