diff options
| author | The Miri Conjob Bot <miri@cron.bot> | 2023-09-27 05:48:00 +0000 |
|---|---|---|
| committer | The Miri Conjob Bot <miri@cron.bot> | 2023-09-27 05:48:00 +0000 |
| commit | b1f5c6683bb38da2cef8d1aa3fb3f88c357d4ae4 (patch) | |
| tree | f8a0d9b55658cff808aa5a8fd51d468c446ef950 /src/ci/scripts | |
| parent | fc0d833f6fb9876c367bb738927525102e5761a7 (diff) | |
| parent | 085acd02d4abaf2ccaf629134caa83cfe23283c8 (diff) | |
| download | rust-b1f5c6683bb38da2cef8d1aa3fb3f88c357d4ae4.tar.gz rust-b1f5c6683bb38da2cef8d1aa3fb3f88c357d4ae4.zip | |
Merge 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. |