diff options
| author | Henry Gressmann <mail@henrygressmann.de> | 2024-01-26 15:25:36 +0100 |
|---|---|---|
| committer | Henry Gressmann <mail@henrygressmann.de> | 2024-01-26 15:25:36 +0100 |
| commit | bed5f13e0c50c44c8b98f5f758ba487a198931ec (patch) | |
| tree | 04cff7bc2a4aa8866e2966bc818cf469057d8230 | |
| parent | bbb1e0bd60c624c3273831df376cff8e12977d2c (diff) | |
ci: fix ci
Signed-off-by: Henry Gressmann <mail@henrygressmann.de>
| -rw-r--r-- | .github/workflows/test.yaml | 19 | ||||
| -rw-r--r-- | examples/wasm-rust.rs | 4 |
2 files changed, 15 insertions, 8 deletions
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 05f7397..6f6fc10 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,8 +16,14 @@ jobs: with: submodules: true - - name: Install stable Rust toolchain - run: rustup update stable + - name: Install stable Rust toolchain & Binaryen + run: | + rustup update stable + rustup update nightly + sudo apt-get install -y binaryen + + - name: Build wasm + run: ./examples/rust/build.sh - name: Build (stable) run: cargo +stable build --workspace @@ -37,8 +43,13 @@ jobs: with: submodules: true - - name: Install nightly Rust toolchain - run: rustup update nightly + - name: Install nightly Rust toolchain & Binaryen + run: | + rustup update nightly + sudo apt-get install -y binaryen + + - name: Build wasm + run: ./examples/rust/build.sh - name: Build (nightly, no default features) run: cargo +nightly build --workspace --no-default-features diff --git a/examples/wasm-rust.rs b/examples/wasm-rust.rs index 2c50c4f..3b26863 100644 --- a/examples/wasm-rust.rs +++ b/examples/wasm-rust.rs @@ -1,7 +1,6 @@ use color_eyre::eyre::Result; use tinywasm::{Extern, FuncContext, Imports, Module, Store}; -#[cfg(not(test))] fn main() -> Result<()> { let args = std::env::args().collect::<Vec<_>>(); if args.len() < 2 { @@ -22,7 +21,6 @@ fn main() -> Result<()> { Ok(()) } -#[cfg(not(test))] fn tinywasm() -> Result<()> { const TINYWASM: &[u8] = include_bytes!("./rust/out/tinywasm.wasm"); let module = Module::parse_bytes(&TINYWASM)?; @@ -45,7 +43,6 @@ fn tinywasm() -> Result<()> { Ok(()) } -#[cfg(not(test))] fn hello() -> Result<()> { const HELLO_WASM: &[u8] = include_bytes!("./rust/out/hello.wasm"); let module = Module::parse_bytes(&HELLO_WASM)?; @@ -68,7 +65,6 @@ fn hello() -> Result<()> { Ok(()) } -#[cfg(not(test))] fn fibonacci() -> Result<()> { const FIBONACCI_WASM: &[u8] = include_bytes!("./rust/out/fibonacci.wasm"); let module = Module::parse_bytes(&FIBONACCI_WASM)?; |