nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #127977 - alexcrichton:update-wasi-sdk, r=Mark-Simulacrum

Browse Source 
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.
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2024-07-22 16:44:05 +08:00 committed by GitHub
commit c89613938d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ci/docker/host-x86_64/dist-various-2/Dockerfile
View File

@ -85,9 +85,9 @@ RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc sun
COPY host-x86_64/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh /tmp/ COPY host-x86_64/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh /tmp/
RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/wasi-sdk-22.0-linux.tar.gz | \ RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-23/wasi-sdk-23.0-x86_64-linux.tar.gz | \
tar -xz tar -xz
ENV WASI_SDK_PATH=/tmp/wasi-sdk-22.0 ENV WASI_SDK_PATH=/tmp/wasi-sdk-23.0-x86_64-linux
COPY scripts/freebsd-toolchain.sh /tmp/ COPY scripts/freebsd-toolchain.sh /tmp/
RUN /tmp/freebsd-toolchain.sh i686 RUN /tmp/freebsd-toolchain.sh i686

4
src/ci/docker/host-x86_64/test-various/Dockerfile
View File

@ -40,9 +40,9 @@ WORKDIR /
COPY scripts/sccache.sh /scripts/ COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh RUN sh /scripts/sccache.sh
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/wasi-sdk-22.0-linux.tar.gz | \ RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-23/wasi-sdk-23.0-x86_64-linux.tar.gz | \
tar -xz tar -xz
ENV WASI_SDK_PATH=/wasi-sdk-22.0 ENV WASI_SDK_PATH=/wasi-sdk-23.0-x86_64-linux
ENV RUST_CONFIGURE_ARGS \ ENV RUST_CONFIGURE_ARGS \
--musl-root-x86_64=/usr/local/x86_64-linux-musl \ --musl-root-x86_64=/usr/local/x86_64-linux-musl \

9
tests/run-make/wasm-panic-small/rmake.rs
View File

@ -13,7 +13,14 @@ fn main() {
fn test(cfg: &str) { fn test(cfg: &str) {
eprintln!("running cfg {cfg:?}"); eprintln!("running cfg {cfg:?}");
rustc().input("foo.rs").target("wasm32-wasip1").arg("-Clto").opt().cfg(cfg).run(); rustc()
.input("foo.rs")
.target("wasm32-wasip1")
.arg("-Clto")
.arg("-Cstrip=debuginfo")
.opt()
.cfg(cfg)
.run();
let bytes = rfs::read("foo.wasm"); let bytes = rfs::read("foo.wasm");
println!("{}", bytes.len()); println!("{}", bytes.len());

8
tests/run-make/wasm-stringify-ints-small/rmake.rs
View File

@ -4,7 +4,13 @@
use run_make_support::{rfs, rustc}; use run_make_support::{rfs, rustc};
fn main() { fn main() {
rustc().input("foo.rs").target("wasm32-wasip1").arg("-Clto").opt().run(); rustc()
.input("foo.rs")
.target("wasm32-wasip1")
.arg("-Clto")
.arg("-Cstrip=debuginfo")
.opt()
.run();
let bytes = rfs::read("foo.wasm"); let bytes = rfs::read("foo.wasm");
println!("{}", bytes.len()); println!("{}", bytes.len());