summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-11-27 21:06:20 +0100
committerlassulus <lassulus@lassul.us>2018-11-28 12:36:17 +0100
commit856c4777d11c45c11c5cb9a74154f2fb99992d18 (patch)
treee221fb341ad2c526fd57cf84d49d6cab8f298819
parent00ff16d540721a5ae605cb753c7d874b44307c22 (diff)
ci: js -> json, output to stderr
-rw-r--r--krebs/3modules/ci.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index bbc58361d..a47dbe611 100644
--- a/krebs/3modules/ci.nix
+++ b/krebs/3modules/ci.nix
@@ -27,14 +27,14 @@ let
hostname = config.networking.hostName;
getJobs = pkgs.writeDash "get_jobs" ''
set -efu
- ${pkgs.nix}/bin/nix-build --no-out-link --quiet -Q ./ci.nix > /dev/null
- js="$(${pkgs.nix}/bin/nix-instantiate --quiet -Q --eval --strict --json ./ci.nix)"
- echo "$js" | ${pkgs.jq}/bin/jq -r 'to_entries[] | [.key, .value] | @tsv' \
+ ${pkgs.nix}/bin/nix-build --no-out-link --quiet -Q ./ci.nix >&2
+ json="$(${pkgs.nix}/bin/nix-instantiate --quiet -Q --eval --strict --json ./ci.nix)"
+ echo "$json" | ${pkgs.jq}/bin/jq -r 'to_entries[] | [.key, .value] | @tsv' \
| while read -r host builder; do
gcroot=${shell.escape profileRoot}/$host-builder
${pkgs.nix}/bin/nix-env -p "$gcroot" --set "$builder"
done
- echo "$js"
+ echo "$json"
'';
profileRoot = "/nix/var/nix/profiles/ci";