Skip to content

Commit

Permalink
Merge branch 'brent/fix-hermes-ci-2'
Browse files Browse the repository at this point in the history
* brent/fix-hermes-ci-2:
  fix CI again
  • Loading branch information
brentstone committed Mar 8, 2024
2 parents 33ff2a6 + c08dfa1 commit 1667830
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down

0 comments on commit 1667830

Please sign in to comment.