about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2019-12-06 15:37:04 +0900
committerGitHub <noreply@github.com>2019-12-06 15:37:04 +0900
commit3b878aa9ae719ec4dec574cf2d1848ef9023ff38 (patch)
treedc22e0aabfda88f0243b9a50736cfb081cffefd3
parentc31773cece7b33b6bbb683e9e122084deb0ac260 (diff)
parentb1ececa669cf6b1481281efb580f2384dfcddfd5 (diff)
downloadrust-3b878aa9ae719ec4dec574cf2d1848ef9023ff38.tar.gz
rust-3b878aa9ae719ec4dec574cf2d1848ef9023ff38.zip
Rollup merge of #66974 - cuviper:not-isCI, r=alexcrichton
[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 ae5b22493ab..38d1d2baf25 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -23,7 +23,7 @@ fi
 ci_dir=`cd $(dirname $0) && pwd`
 source "$ci_dir/shared.sh"
 
-if [ ! isCI ] || isCiBranch auto || isCiBranch beta; then
+if ! isCI || isCiBranch auto || isCiBranch beta; then
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests"
 fi