diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-08 16:32:42 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-08 16:32:42 +0100 |
| commit | ffdb2bc1c5ff0963d1bb1d179c12f5dd218b7612 (patch) | |
| tree | 0250089b73ee5ada1bac9d2ec38c06f570793925 /src/ci | |
| parent | 8407612a8d0fa3195fe7d3785be02790979ddf92 (diff) | |
| download | rust-ffdb2bc1c5ff0963d1bb1d179c12f5dd218b7612.tar.gz rust-ffdb2bc1c5ff0963d1bb1d179c12f5dd218b7612.zip | |
Update the disabled wasm32 Dockerfile
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/disabled/wasm32/Dockerfile | 10 | ||||
| -rw-r--r-- | src/ci/docker/scripts/emscripten.sh | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/ci/docker/disabled/wasm32/Dockerfile b/src/ci/docker/disabled/wasm32/Dockerfile index 6ac90d17450..0d2bd39303e 100644 --- a/src/ci/docker/disabled/wasm32/Dockerfile +++ b/src/ci/docker/disabled/wasm32/Dockerfile @@ -21,11 +21,11 @@ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh ENV PATH=$PATH:/emsdk-portable -ENV PATH=$PATH:/emsdk-portable/clang/e1.37.13_64bit/ -ENV PATH=$PATH:/emsdk-portable/emscripten/1.37.13/ -ENV PATH=$PATH:/node-v8.0.0-linux-x64/bin/ -ENV EMSCRIPTEN=/emsdk-portable/emscripten/1.37.13/ -ENV BINARYEN_ROOT=/emsdk-portable/clang/e1.37.13_64bit/binaryen/ +ENV PATH=$PATH:/emsdk-portable/clang/e1.38.15_64bit/ +ENV PATH=$PATH:/emsdk-portable/emscripten/1.38.15/ +ENV PATH=$PATH:/emsdk-portable/node/8.9.1_64bit/bin/ +ENV EMSCRIPTEN=/emsdk-portable/emscripten/1.38.15/ +ENV BINARYEN_ROOT=/emsdk-portable/clang/e1.38.15_64bit/binaryen/ ENV EM_CONFIG=/emsdk-portable/.emscripten ENV TARGETS=wasm32-unknown-emscripten diff --git a/src/ci/docker/scripts/emscripten.sh b/src/ci/docker/scripts/emscripten.sh index dc4b2af792c..1d7b33db9ed 100644 --- a/src/ci/docker/scripts/emscripten.sh +++ b/src/ci/docker/scripts/emscripten.sh @@ -46,8 +46,3 @@ rm -f a.* # Make emsdk usable by any user cp /root/.emscripten /emsdk-portable chmod a+rxw -R /emsdk-portable - -# node 8 is required to run wasm -cd / -curl -sL https://nodejs.org/dist/v8.0.0/node-v8.0.0-linux-x64.tar.xz | \ - tar -xJ |