diff options
| author | bors <bors@rust-lang.org> | 2025-01-14 20:52:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-14 20:52:08 +0000 |
| commit | 8361aef0d7c29b1501a316a208ed84cd8a2ae5da (patch) | |
| tree | 6c1d3eef067316aa543b5dec7d45e89e8f26b285 /src/ci/docker/scripts | |
| parent | 3736b85779d1db4c215b910004d7efcd7aff8408 (diff) | |
| parent | eb763f81a75900ef9bc7006113b7cd574a0c26a2 (diff) | |
| download | rust-8361aef0d7c29b1501a316a208ed84cd8a2ae5da.tar.gz rust-8361aef0d7c29b1501a316a208ed84cd8a2ae5da.zip | |
Auto merge of #135496 - matthiaskrgr:rollup-ps0cjzn, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #134216 (Enable "jump to def" feature on patterns) - #134880 (Made `Path::name` only have item name rather than full name) - #135466 (Leak check in `impossible_predicates` to avoid monomorphizing impossible instances) - #135476 (Remove remnant of asmjs) - #135479 (mir borrowck: cleanup late-bound region handling) - #135493 (Fix legacy symbol mangling of closures) - #135495 (Add missing closing backtick in commit hook message 🐸) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/emscripten.sh | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/ci/docker/scripts/emscripten.sh b/src/ci/docker/scripts/emscripten.sh deleted file mode 100644 index 8b2b39ee162..00000000000 --- a/src/ci/docker/scripts/emscripten.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -set -ex - -hide_output() { - set +x - on_err=" -echo ERROR: An error was encountered with the build. -cat /tmp/build.log -exit 1 -" - trap "$on_err" ERR - bash -c "while true; do sleep 30; echo \$(date) - building ...; done" & - PING_LOOP_PID=$! - "$@" &> /tmp/build.log - trap - ERR - kill $PING_LOOP_PID - rm -f /tmp/build.log - set -x -} - -git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable -cd /emsdk-portable -hide_output ./emsdk install 3.1.68 -./emsdk activate 3.1.68 |