From 2dac41db54cf67fbda8e94066c9549529ffbfc32 Mon Sep 17 00:00:00 2001 From: miampf Date: Wed, 5 Feb 2025 13:55:46 +0100 Subject: [PATCH] improve jq filter --- .github/workflows/check-measurements-reproducibility.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-measurements-reproducibility.yml b/.github/workflows/check-measurements-reproducibility.yml index a804ce5b8..15d970763 100644 --- a/.github/workflows/check-measurements-reproducibility.yml +++ b/.github/workflows/check-measurements-reproducibility.yml @@ -42,7 +42,9 @@ jobs: attestationVariant="$(echo $dirname | cut -d_ -f2)" echo "Comparing measurements of CSP $csp with attestation variant $attestationVariant" - jq --arg attestation_variant "$attestationVariant" --arg csp "$csp" '.list.[] | select(.attestationVariant == $attestation_variant) | select((.csp | ascii_downcase) == $csp) | .measurements | del(.[] .warnOnly)' measurements.json > their-measurements.json + jq --arg attestation_variant "$attestationVariant" --arg csp "$csp" \ + '.list.[] | select(.attestationVariant == $attestation_variant) | select((.csp | ascii_downcase) == $csp) | .measurements | walk(if (type=="object" and (.warnOnly or .expected == "0000000000000000000000000000000000000000000000000000000000000000")) then del(.) else . end) | del(..|nulls) | del(.[] .warnOnly)' \ + measurements.json > their-measurements.json sudo env "PATH=$PATH" "$buildPath/measured-boot/cmd/cmd_/cmd" "$directory/constellation" ./own-measurements.json jq '.measurements' own-measurements.json | sponge ./own-measurements.json