From 1cc4200b3ed177bc45b143d9ac5110f7dcf74d24 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Tue, 10 Dec 2024 12:04:37 +0200 Subject: [PATCH] feat(tvix/boot/tests): Replace GNU parallel with rush rush is like GNU parallel, but in Go, and most importantly, without the annoying citation. Change-Id: Id4737e6dee43037c1c2bc814738416410a603e07 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12887 Reviewed-by: flokli Autosubmit: Ilan Joselevich Tested-by: BuildkiteCI --- tvix/boot/tests/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tvix/boot/tests/default.nix b/tvix/boot/tests/default.nix index 64b2f7f52..3748f7620 100644 --- a/tvix/boot/tests/default.nix +++ b/tvix/boot/tests/default.nix @@ -48,7 +48,7 @@ let ] ++ lib.optionals (isClosure && useNarBridge) [ depot.tvix.nar-bridge pkgs.curl - pkgs.parallel + pkgs.rush-parallel pkgs.xz.bin ]; buildCommand = '' @@ -103,7 +103,7 @@ let # nar-bridge doesn't care about the path we upload *to*, but a # subsequent .narinfo upload need to refer to its contents (by narhash). echo -e "Uploading NARs… " - ls -d $to_upload/nar/*.nar.xz | parallel 'xz -d < {} | curl -s -T - --unix-socket $PWD/nar-bridge.sock http://localhost:9000/nar/$(basename {} | cut -d "." -f 1).nar' + ls -d $to_upload/nar/*.nar.xz | rush 'xz -d < {} | curl -s -T - --unix-socket $PWD/nar-bridge.sock http://localhost:9000/nar/$(basename {} | cut -d "." -f 1).nar' echo "Done." # Upload all NARInfo files. @@ -111,7 +111,7 @@ let # on PathInfoService not doing any checking. # In the future, we might want to make this behaviour configurable, # and disable checking here, to keep the logic simple. - ls -d $to_upload/*.narinfo | parallel 'curl -s -T - --unix-socket $PWD/nar-bridge.sock http://localhost:9000/$(basename {}) < {}' + ls -d $to_upload/*.narinfo | rush 'curl -s -T - --unix-socket $PWD/nar-bridge.sock http://localhost:9000/$(basename {}) < {}' '' + '' # Invoke a VM using tvix as the backing store, ensure the outpath appears in its listing. echo "Starting VM…"