diff options
| author | bors <bors@rust-lang.org> | 2023-09-27 06:51:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-27 06:51:43 +0000 |
| commit | 1a3dd7ea7d929db798b7095d3c25f50b49a52fb4 (patch) | |
| tree | 69c3f1ea1b4d8aab2e857ca1604cfe6bbdff7d2f /src/ci/scripts | |
| parent | e86c68aa545fc3cfa5085811590e52011ed1a602 (diff) | |
| parent | c8a44b1eaf5aed5cf8e57340f1ac56c9bad08acf (diff) | |
| download | rust-1a3dd7ea7d929db798b7095d3c25f50b49a52fb4.tar.gz rust-1a3dd7ea7d929db798b7095d3c25f50b49a52fb4.zip | |
Auto merge of #3087 - rust-lang:rustup-2023-09-27, r=RalfJung
Automatic sync from rustc
Diffstat (limited to 'src/ci/scripts')
| -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. |