diff options
| author | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2023-02-24 16:33:28 +0100 |
|---|---|---|
| committer | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2023-05-08 12:58:59 +0200 |
| commit | 5e332aa5030d2d6780db18c4cb042e3a6f178923 (patch) | |
| tree | 4fa5738f8388946cfaf2c725e93ab5937eab398d /tests | |
| parent | 12685ef45fa81e5a5ea550bf469d7722fe9c8709 (diff) | |
tests: copying only the out paths is not enough information for CA
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/post-hook.sh | 3 | ||||
| -rwxr-xr-x | tests/push-to-store.sh | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/post-hook.sh b/tests/post-hook.sh index 8b7838058..c974ea1b0 100644 --- a/tests/post-hook.sh +++ b/tests/post-hook.sh @@ -18,7 +18,8 @@ fi # Build the dependencies and push them to the remote store. nix-build -o $TEST_ROOT/result dependencies.nix --post-build-hook "$pushToStore" # See if all outputs are passed to the post-build hook by only specifying one -export BUILD_HOOK_ONLY_OUT_PATHS=1 +# TODO: BUILD_HOOK_ONLY_OUT_PATHS does not work with CA tests +export BUILD_HOOK_ONLY_OUT_PATHS=$([ ! $NIX_TESTS_CA_BY_DEFAULT ]) nix-build -o $TEST_ROOT/result-mult multiple-outputs.nix -A a.first --post-build-hook "$pushToStore" clearStore diff --git a/tests/push-to-store.sh b/tests/push-to-store.sh index 9e4e475e0..b5f099fe2 100755 --- a/tests/push-to-store.sh +++ b/tests/push-to-store.sh @@ -9,6 +9,7 @@ set -e echo Pushing "$OUT_PATHS" to "$REMOTE_STORE" if [ -n "$BUILD_HOOK_ONLY_OUT_PATHS" ]; then printf "%s" "$OUT_PATHS" | xargs nix copy --to "$REMOTE_STORE" --no-require-sigs + printf "%s" "$DRV_PATH" | xargs nix copy --to "$REMOTE_STORE" --no-require-sigs --derivation else printf "%s" "$DRV_PATH"^'*' | xargs nix copy --to "$REMOTE_STORE" --no-require-sigs fi |