Skip to content

Commit 137de93

Browse files
committed
ci: Update wasm32 to ubuntu:22.04
1 parent 294b214 commit 137de93

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Diff for: src/ci/docker/host-x86_64/wasm32/Dockerfile

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22

3-
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
3+
ARG DEBIAN_FRONTEND=noninteractive
4+
RUN apt-get update && apt-get install -y --no-install-recommends \
45
g++ \
56
make \
67
ninja-build \
@@ -20,9 +21,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
2021
COPY scripts/emscripten.sh /scripts/
2122
RUN bash /scripts/emscripten.sh
2223

23-
COPY scripts/cmake.sh /scripts/
24-
RUN /scripts/cmake.sh
25-
2624
COPY scripts/sccache.sh /scripts/
2725
RUN sh /scripts/sccache.sh
2826

@@ -57,6 +55,7 @@ COPY static/gitconfig /etc/gitconfig
5755

5856
# Emscripten installation is user-specific
5957
ENV NO_CHANGE_USER=1
58+
RUN chown 10719 -R /emsdk-portable/
6059

6160
# Exclude library/alloc due to OOM in benches.
6261
ENV SCRIPT python3 ../x.py test --stage 2 --host='' --target $TARGETS \

0 commit comments

Comments
 (0)