Skip to content

Commit

Permalink
Auto merge of #116147 - compiler-errors:jq, r=dtolnay
Browse files Browse the repository at this point in the history
Fix jq in CI

r? `@Mark-Simulacrum`
  • Loading branch information
bors committed Sep 25, 2023
2 parents af68593 + 2ffef39 commit 9d32ba3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/ci/scripts/setup-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"

# Load extra environment variables
vars="${EXTRA_VARIABLES-}"
echo "${vars}" | jq '' >/dev/null # Validate JSON and exit on errors
echo "${vars}" | jq '.' >/dev/null # Validate JSON and exit on errors
for key in $(echo "${vars}" | jq "keys[]" -r); do
# On Windows, for whatever reason, $key contains the BOM character in it,
# and that messes up `jq ".${key}"`. This line strips the BOM from the key.
Expand Down

0 comments on commit 9d32ba3

Please sign in to comment.