diff options
| author | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2023-02-28 10:56:12 +0100 |
|---|---|---|
| committer | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2023-05-08 12:58:59 +0200 |
| commit | d1ff33d2d6f966da4d7ee85918cf6b12b951135f (patch) | |
| tree | ce174e8bc47560e625c3bd90415b148762810d6e /tests | |
| parent | 5e332aa5030d2d6780db18c4cb042e3a6f178923 (diff) | |
tests/post-hook: remove TODO and --derivation upload
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/post-hook.sh | 2 | ||||
| -rwxr-xr-x | tests/push-to-store.sh | 1 |
2 files changed, 1 insertions, 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 |