diff options
| author | bors <bors@rust-lang.org> | 2019-12-06 07:43:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-06 07:43:56 +0000 |
| commit | d0126e8ed3cc0d6fcb9dd44c36a46f9ce65010a0 (patch) | |
| tree | 1e574274dfc984cf278d7a39e154b408f1663485 /src/ci | |
| parent | 7b482cdf7ce55e05ee8392e1ade70966e3189cfd (diff) | |
| parent | acd2b0835d1b833b851501a9d255ee7882f45a84 (diff) | |
| download | rust-d0126e8ed3cc0d6fcb9dd44c36a46f9ce65010a0.tar.gz rust-d0126e8ed3cc0d6fcb9dd44c36a46f9ce65010a0.zip | |
Auto merge of #67080 - JohnTitor:rollup-2t6fm3u, r=JohnTitor
Rollup of 10 pull requests Successful merges: - #66649 (VxWorks: fix issues in accessing environment variables) - #66764 (Tweak wording of `collect()` on bad target type) - #66900 (Clean up error codes) - #66974 ([CI] fix the `! isCI` check in src/ci/run.sh) - #66979 (Add long error for E0631 and update ui tests.) - #67017 (cleanup long error explanations) - #67021 (Fix docs for formatting delegations) - #67041 (add ExitStatusExt into prelude) - #67065 (Fix fetching arguments on the wasm32-wasi target) - #67066 (Update the revision of wasi-libc used in wasm32-wasi) Failed merges: r? @ghost
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/docker/dist-various-2/build-wasi-toolchain.sh | 2 | ||||
| -rwxr-xr-x | src/ci/run.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/dist-various-2/build-wasi-toolchain.sh b/src/ci/docker/dist-various-2/build-wasi-toolchain.sh index 17aa78945cf..925d5ca0223 100755 --- a/src/ci/docker/dist-various-2/build-wasi-toolchain.sh +++ b/src/ci/docker/dist-various-2/build-wasi-toolchain.sh @@ -12,7 +12,7 @@ export PATH=`pwd`/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-14.04/bin:$PATH git clone https://github.com/CraneStation/wasi-libc cd wasi-libc -git reset --hard a94d2d04e7722b323573da2bd04e909a5763d35b +git reset --hard f645f498dfbbbc00a7a97874d33082d3605c3f21 make -j$(nproc) INSTALL_DIR=/wasm32-wasi install cd .. 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 |