From d1ff33d2d6f966da4d7ee85918cf6b12b951135f Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Tue, 28 Feb 2023 10:56:12 +0100 Subject: [PATCH] tests/post-hook: remove TODO and --derivation upload --- tests/post-hook.sh | 2 +- tests/push-to-store.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/post-hook.sh b/tests/post-hook.sh index c974ea1b0..752f8220c 100644 --- a/tests/post-hook.sh +++ b/tests/post-hook.sh @@ -18,7 +18,7 @@ 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 -# TODO: BUILD_HOOK_ONLY_OUT_PATHS does not work with CA tests +# We're not able to test CA tests this way 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" diff --git a/tests/push-to-store.sh b/tests/push-to-store.sh index b5f099fe2..9e4e475e0 100755 --- a/tests/push-to-store.sh +++ b/tests/push-to-store.sh @@ -9,7 +9,6 @@ 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