From 56e9abf945f2bfc9bab478f9e2a1e99cb1494ee5 Mon Sep 17 00:00:00 2001 From: Jack O'Sullivan Date: Tue, 26 Nov 2024 22:45:19 +0000 Subject: [PATCH] ci: Build and grab path for jobs in separate calls The old build-n-parse seemed to output null sometimes..... --- .gitea/workflows/ci.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index b040f8c..bdfba21 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -33,11 +33,12 @@ jobs: run: | nix eval --json --apply "builtins.attrNames" .#ci.x86_64-linux | jq -cr '.[]' | while read job; do echo "Building CI job $job" - path="$(nix build --no-link .#ci.x86_64-linux."$job" --json | jq -r .[0].outputs.out)" + nix build --no-link .#ci.x86_64-linux."$job" + echo "Caching CI job $job" - ci/push-to-cache.sh "$path" + ci/push-to-cache.sh "$(nix eval --raw .#ci.x86_64-linux."$job")" done echo "Building and caching CI derivation" - path="$(nix build --no-link .#ciDrv.x86_64-linux --json | jq -r .[0].outputs.out)" - UPDATE_PROFILE=1 ci/push-to-cache.sh "$path" + nix build --no-link .#ciDrv.x86_64-linux + UPDATE_PROFILE=1 ci/push-to-cache.sh "$(nix eval --raw .#ciDrv.x86_64-linux)"