move ci/ to test/
This commit is contained in:
parent
eaf98f92db
commit
0fd3be5343
@ -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
|
||||||
|
@ -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
|
@ -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"
|
||||||
|
Loading…
Reference in New Issue
Block a user