diff options
| author | Josh Stone <jistone@redhat.com> | 2023-07-21 09:04:49 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2023-07-21 12:22:25 -0700 |
| commit | 137de9365eb390d2b197ec05fb7b377aef2739ae (patch) | |
| tree | ecc601bc049a8b57e54625da36cef204105cdef2 /src/ci | |
| parent | 294b2145e006cd5621bedc8b719dd7869e9c66e7 (diff) | |
| download | rust-137de9365eb390d2b197ec05fb7b377aef2739ae.tar.gz rust-137de9365eb390d2b197ec05fb7b377aef2739ae.zip | |
ci: Update wasm32 to ubuntu:22.04
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/host-x86_64/wasm32/Dockerfile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ci/docker/host-x86_64/wasm32/Dockerfile b/src/ci/docker/host-x86_64/wasm32/Dockerfile index 0e8989e10f2..24a1ccb7fc2 100644 --- a/src/ci/docker/host-x86_64/wasm32/Dockerfile +++ b/src/ci/docker/host-x86_64/wasm32/Dockerfile @@ -1,6 +1,7 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ +ARG DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y --no-install-recommends \ g++ \ make \ ninja-build \ @@ -20,9 +21,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins COPY scripts/emscripten.sh /scripts/ RUN bash /scripts/emscripten.sh -COPY scripts/cmake.sh /scripts/ -RUN /scripts/cmake.sh - COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh @@ -57,6 +55,7 @@ COPY static/gitconfig /etc/gitconfig # Emscripten installation is user-specific ENV NO_CHANGE_USER=1 +RUN chown 10719 -R /emsdk-portable/ # Exclude library/alloc due to OOM in benches. ENV SCRIPT python3 ../x.py test --stage 2 --host='' --target $TARGETS \ |