From 2a8e1b8ae7df741f65ce59411bcd08011e61b181 Mon Sep 17 00:00:00 2001 From: Fantix King Date: Tue, 17 Dec 2024 17:17:00 -0500 Subject: [PATCH] CI: fix jq to handle missing metadata (#1432) --- .github/workflows.src/build.inc.yml | 2 +- .github/workflows/nightly.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows.src/build.inc.yml b/.github/workflows.src/build.inc.yml index d82c0aaaa..fb6e67bac 100644 --- a/.github/workflows.src/build.inc.yml +++ b/.github/workflows.src/build.inc.yml @@ -27,7 +27,7 @@ shell: bash run: | rev=$(git rev-parse HEAD) - jq_filter='.packages[] | select(.basename == "edgedb-cli") | select(.architecture == $ARCH) | .version_details.metadata.scm_revision | . as $rev | select($REV | startswith($rev))' + jq_filter='.packages[] | select(.basename == "edgedb-cli") | select(.architecture == $ARCH) | .version_details.metadata.scm_revision | select(. != null) | . as $rev | select($REV | startswith($rev))' <% for tgt in targets.linux %> val=true <% if tgt.family == "debian" %> diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 531cc6350..9f5a9b011 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -84,7 +84,7 @@ jobs: shell: bash run: | rev=$(git rev-parse HEAD) - jq_filter='.packages[] | select(.basename == "edgedb-cli") | select(.architecture == $ARCH) | .version_details.metadata.scm_revision | . as $rev | select($REV | startswith($rev))' + jq_filter='.packages[] | select(.basename == "edgedb-cli") | select(.architecture == $ARCH) | .version_details.metadata.scm_revision | select(. != null) | . as $rev | select($REV | startswith($rev))' val=true