From 6a34441a660ca1fa2edbd45383945119ed8d245f Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Wed, 21 Aug 2024 23:20:25 +0300 Subject: [PATCH 1/3] Fix the CI? --- .github/workflows/test.yml | 4 ++-- Cargo.toml | 2 +- psm/build.rs | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 25f9401..422bfaa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,14 +17,14 @@ jobs: strategy: fail-fast: false matrix: - rust_toolchain: [nightly, stable, 1.38.0] + rust_toolchain: [nightly, stable, 1.63.0] os: [ubuntu-latest, windows-latest, macOS-latest] mode: ['--release', '-Zminimal-versions', ''] manifest: ['psm/Cargo.toml', 'Cargo.toml'] exclude: - rust_toolchain: stable mode: -Zminimal-versions - - rust_toolchain: 1.38.0 + - rust_toolchain: 1.63.0 mode: -Zminimal-versions timeout-minutes: 10 steps: diff --git a/Cargo.toml b/Cargo.toml index 5c33c19..f072a7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "stacker" -version = "0.1.15" +version = "0.1.16" authors = ["Alex Crichton ", "Simonas Kazlauskas "] build = "build.rs" license = "MIT OR Apache-2.0" diff --git a/psm/build.rs b/psm/build.rs index 9d40212..7ffb45d 100644 --- a/psm/build.rs +++ b/psm/build.rs @@ -7,6 +7,7 @@ fn find_assembly( env: &str, masm: bool, ) -> Option<(&'static str, bool)> { + println!("cargo::rustc-check-cfg=cfg(switchable_stack,asm)"); match (arch, endian, os, env) { // The implementations for stack switching exist, but, officially, doing so without Fibers // is not supported in Windows. For x86_64 the implementation actually works locally, From 8e1b6ea7b583cba2b56af534f0ffd8e2e31791a1 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Wed, 21 Aug 2024 23:40:45 +0300 Subject: [PATCH 2/3] update wasmtime --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 422bfaa..f4f8b97 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -324,7 +324,7 @@ jobs: default: true target: wasm32-wasi - run: | - curl -Lf https://github.com/bytecodealliance/wasmtime/releases/download/v0.19.0/wasmtime-v0.19.0-x86_64-linux.tar.xz | tar xJf - -C ${{ runner.tool_cache }} - echo "${{ runner.tool_cache }}/wasmtime-v0.19.0-x86_64-linux" >> $GITHUB_PATH + curl -Lf https://github.com/bytecodealliance/wasmtime/releases/download/v24.0.0/wasmtime-v24.0.0-x86_64-linux.tar.xz | tar xJf - -C ${{ runner.tool_cache }} + echo "${{ runner.tool_cache }}/wasmtime-v24.0.0-x86_64-linux" >> $GITHUB_PATH echo "CARGO_TARGET_WASM32_WASI_RUNNER=wasmtime run --" >> $GITHUB_ENV - run: cargo test --target wasm32-wasi --all -- --nocapture From 0de74ba5aea9dd6891af2088264a7ac53af64176 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Wed, 21 Aug 2024 23:43:13 +0300 Subject: [PATCH 3/3] disable mips* CI --- .github/workflows/test.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f4f8b97..53e887c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -136,10 +136,11 @@ jobs: - armv7-unknown-linux-gnueabihf - i686-unknown-linux-gnu - i686-unknown-linux-musl - - mips-unknown-linux-gnu - - mips64-unknown-linux-gnuabi64 - - mips64el-unknown-linux-gnuabi64 - - mipsel-unknown-linux-gnu + # No libstd available :( + # - mips-unknown-linux-gnu + # - mips64-unknown-linux-gnuabi64 + # - mips64el-unknown-linux-gnuabi64 + # - mipsel-unknown-linux-gnu - powerpc-unknown-linux-gnu # https://github.com/rust-embedded/cross/pull/440 # - powerpc64-unknown-linux-gnu