Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d9d06ba

Browse files
authoredJul 21, 2024
Rollup merge of rust-lang#127977 - alexcrichton:update-wasi-sdk, r=Mark-Simulacrum
Update wasi-sdk in CI to latest release This commit updates the `wasi-sdk` download used by the `wasm32-wasi*` targets. The motivation for this commit is generally just "keep things up to date" and is not intended to cause any issues or differences from before, just a routine update.
2 parents 1ab77b5 + 006c884 commit d9d06ba

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed
 

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc sun
8585
COPY host-x86_64/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh /tmp/
8686
RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh
8787

88-
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/wasi-sdk-22.0-linux.tar.gz | \
88+
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-23/wasi-sdk-23.0-x86_64-linux.tar.gz | \
8989
tar -xz
90-
ENV WASI_SDK_PATH=/tmp/wasi-sdk-22.0
90+
ENV WASI_SDK_PATH=/tmp/wasi-sdk-23.0-x86_64-linux
9191

9292
COPY scripts/freebsd-toolchain.sh /tmp/
9393
RUN /tmp/freebsd-toolchain.sh i686

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ WORKDIR /
4040
COPY scripts/sccache.sh /scripts/
4141
RUN sh /scripts/sccache.sh
4242

43-
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/wasi-sdk-22.0-linux.tar.gz | \
43+
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-23/wasi-sdk-23.0-x86_64-linux.tar.gz | \
4444
tar -xz
45-
ENV WASI_SDK_PATH=/wasi-sdk-22.0
45+
ENV WASI_SDK_PATH=/wasi-sdk-23.0-x86_64-linux
4646

4747
ENV RUST_CONFIGURE_ARGS \
4848
--musl-root-x86_64=/usr/local/x86_64-linux-musl \

‎tests/run-make/wasm-panic-small/rmake.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@ fn main() {
1313
fn test(cfg: &str) {
1414
eprintln!("running cfg {cfg:?}");
1515

16-
rustc().input("foo.rs").target("wasm32-wasip1").arg("-Clto").opt().cfg(cfg).run();
16+
rustc()
17+
.input("foo.rs")
18+
.target("wasm32-wasip1")
19+
.arg("-Clto")
20+
.arg("-Cstrip=debuginfo")
21+
.opt()
22+
.cfg(cfg)
23+
.run();
1724

1825
let bytes = rfs::read("foo.wasm");
1926
println!("{}", bytes.len());

‎tests/run-make/wasm-stringify-ints-small/rmake.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
use run_make_support::{rfs, rustc};
55

66
fn main() {
7-
rustc().input("foo.rs").target("wasm32-wasip1").arg("-Clto").opt().run();
7+
rustc()
8+
.input("foo.rs")
9+
.target("wasm32-wasip1")
10+
.arg("-Clto")
11+
.arg("-Cstrip=debuginfo")
12+
.opt()
13+
.run();
814

915
let bytes = rfs::read("foo.wasm");
1016
println!("{}", bytes.len());

0 commit comments

Comments
 (0)
Failed to load comments.