diff options
| author | bors <bors@rust-lang.org> | 2023-09-25 14:42:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-25 14:42:27 +0000 |
| commit | 9d32ba3a7219e28b0d44b5eb4d564ca58114356f (patch) | |
| tree | ce11e4757831ef0ea380d54dfa6a0c3e38cfcd61 | |
| parent | af685931799459879b2a8995524755a06ffb5eec (diff) | |
| parent | 2ffef3949e4f04a1621ba47058bef6f78443abc4 (diff) | |
| download | rust-9d32ba3a7219e28b0d44b5eb4d564ca58114356f.tar.gz rust-9d32ba3a7219e28b0d44b5eb4d564ca58114356f.zip | |
Auto merge of #116147 - compiler-errors:jq, r=dtolnay
Fix jq in CI r? `@Mark-Simulacrum`
| -rwxr-xr-x | src/ci/scripts/setup-environment.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh index 0bc35f93283..d3c55a4d6b4 100755 --- a/src/ci/scripts/setup-environment.sh +++ b/src/ci/scripts/setup-environment.sh @@ -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. |