summaryrefslogtreecommitdiffstats
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
parentRollup merge of #66900 - GuillaumeGomez:clean-up-err-codes, r=Dylan-DPC (diff)
parent[CI] fix the `! isCI` check in src/ci/run.sh (diff)
downloadrust-3b878aa9ae719ec4dec574cf2d1848ef9023ff38.tar.gz
rust-3b878aa9ae719ec4dec574cf2d1848ef9023ff38.tar.bz2
rust-3b878aa9ae719ec4dec574cf2d1848ef9023ff38.tar.xz
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 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