diff options
| author | Valentin Gagarin <valentin.gagarin@tweag.io> | 2023-02-28 23:48:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-28 23:48:17 +0100 |
| commit | d5af43cb420fd5228c6e07a62fc53fcadb626aa3 (patch) | |
| tree | 9cfb84ce3b72c7dac28e99a3546ae334edadae44 /tests/ca | |
| parent | db14e1d4aeb206e302f9cd9f02a10e9be0499e2c (diff) | |
| parent | ea0adfc582e8c0d233cec03da9258caf718678b7 (diff) | |
Merge pull request #7600 from obsidiansystems/explicit-drv-ness
Diffstat (limited to 'tests/ca')
| -rw-r--r-- | tests/ca/substitute.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/ca/substitute.sh b/tests/ca/substitute.sh index 819f3fd85..ea981adc4 100644 --- a/tests/ca/substitute.sh +++ b/tests/ca/substitute.sh @@ -28,6 +28,12 @@ nix realisation info --file ./content-addressed.nix transitivelyDependentCA nix realisation info --file ./content-addressed.nix dependentCA # nix realisation info --file ./content-addressed.nix rootCA --outputs out +if isDaemonNewer "2.13"; then + pushToStore="../push-to-store.sh" +else + pushToStore="../push-to-store-old.sh" +fi + # Same thing, but # 1. With non-ca derivations # 2. Erasing the realisations on the remote store @@ -37,7 +43,7 @@ nix realisation info --file ./content-addressed.nix dependentCA # # Regression test for #4725 clearStore -nix build --file ../simple.nix -L --no-link --post-build-hook ../push-to-store.sh +nix build --file ../simple.nix -L --no-link --post-build-hook "$pushToStore" clearStore rm -r "$REMOTE_STORE_DIR/realisations" nix build --file ../simple.nix -L --no-link --substitute --substituters "$REMOTE_STORE" --no-require-sigs -j0 @@ -52,7 +58,7 @@ if [[ -z "$(ls "$REMOTE_STORE_DIR/realisations")" ]]; then fi # Test the local realisation disk cache -buildDrvs --post-build-hook ../push-to-store.sh +buildDrvs --post-build-hook "$pushToStore" clearStore # Add the realisations of rootCA to the cachecache clearCacheCache |