Skip to content

Commit 5095b44

Browse files
committed
Auto merge of #154596 - alexcrichton:update-wasi-sdk, r=jieyouxu
Update to wasi-sdk-32 in CI/releases Similar to prior updates such as #149037. This notably pulls in some bug fixes for wasi-libc around nonblocking I/O and networking.
2 parents 30837cb + c14d998 commit 5095b44

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/ci/docker/host-x86_64/dist-various-2/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ RUN /tmp/build-fuchsia-toolchain.sh
8787
COPY host-x86_64/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh /tmp/
8888
RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh
8989

90-
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-30/wasi-sdk-30.0-x86_64-linux.tar.gz | \
90+
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-32/wasi-sdk-32.0-x86_64-linux.tar.gz | \
9191
tar -xz
92-
ENV WASI_SDK_PATH=/tmp/wasi-sdk-30.0-x86_64-linux
92+
ENV WASI_SDK_PATH=/tmp/wasi-sdk-32.0-x86_64-linux
9393

9494
COPY scripts/freebsd-toolchain.sh /tmp/
9595
RUN /tmp/freebsd-toolchain.sh i686

src/ci/docker/host-x86_64/pr-check-2/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2121
mingw-w64 \
2222
&& rm -rf /var/lib/apt/lists/*
2323

24-
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-30/wasi-sdk-30.0-x86_64-linux.tar.gz | \
24+
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-32/wasi-sdk-32.0-x86_64-linux.tar.gz | \
2525
tar -xz
26-
ENV WASI_SDK_PATH=/wasi-sdk-30.0-x86_64-linux
26+
ENV WASI_SDK_PATH=/wasi-sdk-32.0-x86_64-linux
2727

2828
ENV RUST_CONFIGURE_ARGS="--set rust.validate-mir-opts=3"
2929

src/ci/docker/host-x86_64/test-various/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ WORKDIR /
4343
COPY scripts/sccache.sh /scripts/
4444
RUN sh /scripts/sccache.sh
4545

46-
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-30/wasi-sdk-30.0-x86_64-linux.tar.gz | \
46+
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-32/wasi-sdk-32.0-x86_64-linux.tar.gz | \
4747
tar -xz
48-
ENV WASI_SDK_PATH=/wasi-sdk-30.0-x86_64-linux
48+
ENV WASI_SDK_PATH=/wasi-sdk-32.0-x86_64-linux
4949

5050
ENV RUST_CONFIGURE_ARGS="--musl-root-x86_64=/usr/local/x86_64-linux-musl \
5151
--set rust.lld"

0 commit comments

Comments
 (0)