diff options
| author | bors <bors@rust-lang.org> | 2020-08-20 18:02:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-20 18:02:46 +0000 |
| commit | 332369110919ac27c8a0bc0b21bf9d2f9fd9829d (patch) | |
| tree | 7550284cf555c2114a04a390ba0bda55ae6973d9 /src/ci/docker/scripts | |
| parent | 814d252417cec7cfca98d75db0b3d89555d6d676 (diff) | |
| parent | 2a3f43de428c70e140c7882174855165b1724f5f (diff) | |
| download | rust-332369110919ac27c8a0bc0b21bf9d2f9fd9829d.tar.gz rust-332369110919ac27c8a0bc0b21bf9d2f9fd9829d.zip | |
Auto merge of #75747 - cuviper:rollup-icke90l, r=cuviper
Rollup of 8 pull requests Successful merges: - #75672 (Move to intra-doc links for task.rs and vec.rs) - #75702 (Clean up E0759 explanation) - #75703 (Enable stack-overflow detection on musl for non-main threads) - #75710 (Fix bad printing of const-eval queries) - #75716 (Upgrade Emscripten on CI to 1.39.20 ) - #75731 (Suppress ty::Float in MIR comments of ty::Const) - #75733 (Remove duplicated alloc vec bench push_all_move) - #75743 (Rename rustc_lexer::TokenKind::Not to Bang) Failed merges: r? @ghost
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/emscripten.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/scripts/emscripten.sh b/src/ci/docker/scripts/emscripten.sh index 9f6a7f2e5db..9481ee95399 100644 --- a/src/ci/docker/scripts/emscripten.sh +++ b/src/ci/docker/scripts/emscripten.sh @@ -19,5 +19,5 @@ exit 1 git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable cd /emsdk-portable -hide_output ./emsdk install 1.38.47-upstream -./emsdk activate 1.38.47-upstream +hide_output ./emsdk install 1.39.20 +./emsdk activate 1.39.20 |