summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2019-12-02 11:49:38 -0800
committerJosh Stone <jistone@redhat.com>2019-12-02 11:49:38 -0800
commitb1ececa669cf6b1481281efb580f2384dfcddfd5 (patch)
treef7d8958772296b4492cc5bf69c9a0193588af090
parentAuto merge of #64736 - Nashenas88:mir_predecessors_cache_cleanup, r=oli-obk (diff)
downloadrust-b1ececa669cf6b1481281efb580f2384dfcddfd5.tar.gz
rust-b1ececa669cf6b1481281efb580f2384dfcddfd5.tar.bz2
rust-b1ececa669cf6b1481281efb580f2384dfcddfd5.tar.xz
[CI] fix the `! isCI` check in src/ci/run.sh
Using `if [ ! isCI ] || ...` doesn't run any command, just tests `isCI` as a string, whereas `if ! isCI || ...` will actually run the `isCI` command and negate its exit status.
-rwxr-xr-xsrc/ci/run.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh
index ae5b224..38d1d2b 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -23,7 +23,7 @@ fi
23ci_dir=`cd $(dirname $0) && pwd` 23ci_dir=`cd $(dirname $0) && pwd`
24source "$ci_dir/shared.sh" 24source "$ci_dir/shared.sh"
25 25
26if [ ! isCI ] || isCiBranch auto || isCiBranch beta; then 26if ! isCI || isCiBranch auto || isCiBranch beta; then
27 RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests" 27 RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests"
28fi 28fi
29 29