Skip to content

Commit

Permalink
Rollup merge of rust-lang#120726 - saethlin:no-bashism, r=Mark-Simula…
Browse files Browse the repository at this point in the history
…crum

Don't use bashism in checktools.sh

`if [[` doesn't work because this is a `/bin/sh` script. We were never running the success side of this `if` at all.
  • Loading branch information
Nadrieril authored Feb 7, 2024
2 parents 0d3ff16 + 14dda5f commit ce49414
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ python3 "$X_PY" test --stage 2 src/tools/rustfmt
# We set the GC interval to the shortest possible value (0 would be off) to increase the chance
# that bugs which only surface when the GC runs at a specific time are more likely to cause CI to fail.
# This significantly increases the runtime of our test suite, or we'd do this in PR CI too.
if [[ -z "${PR_CI_JOB:-}" ]]; then
if [ -z "${PR_CI_JOB:-}" ]; then
MIRIFLAGS=-Zmiri-provenance-gc=1 python3 "$X_PY" test --stage 2 src/tools/miri
else
python3 "$X_PY" test --stage 2 src/tools/miri
Expand Down

0 comments on commit ce49414

Please sign in to comment.