From c08dfa106228a77f6382fee6788748e76557f1b9 Mon Sep 17 00:00:00 2001 From: brentstone Date: Fri, 8 Mar 2024 14:23:47 +0100 Subject: [PATCH] fix CI again --- .github/workflows/build-and-test.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index ebc005d1d7..1174032cbc 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -649,11 +649,9 @@ jobs: - name: Download Hermes run: | BRANCH_NAME=$(git symbolic-ref --short HEAD) - echo "Using hermes for branch: ${BRANCH_NAME}" - HERMES_VERSION=$(cat .github/workflows/scripts/hermes.json | jq .${BRANCH_NAME:-invalid} -r -e) + HERMES_VERSION=$(cat .github/workflows/scripts/hermes.json | jq .${BRANCH_NAME:-invalid} -r -e || true) HERMES_VERSION_DEFAULT=$(cat .github/workflows/scripts/hermes.json | jq .default -r) - if [ -z "$HERMES_VERSION" ] - then + if [ "$HERMES_VERSION" = "null" ]; then HERMES_VERSION=$HERMES_VERSION_DEFAULT fi echo "Using hermes version: ${HERMES_VERSION}"