Merge pull request #1323 from stlankes/ci

extend CI to test the wasmtime-demo
hermit-os · Jul 18, 2024 · 4da94e9 · 4da94e9
2 parents 3021646 + 625ab4a
commit 4da94e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -161,6 +161,8 @@ jobs:
       - uses: mkroening/rust-toolchain-toml@main
       - run: rustup component add llvm-tools
         working-directory: .
+      - run: rustup target add wasm32-wasi
+        working-directory: .
       - uses: mkroening/rust-toolchain-toml@main
         with:
           toolchain-file: 'kernel/rust-toolchain.toml'
@@ -184,6 +186,8 @@ jobs:
       - run: cargo +stable install cargo-careful
         if: matrix.profile == 'dev'
       - run: cargo xtask ci qemu --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} --package hello_world
+      - run: cargo xtask ci qemu --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} --package wasmtime-demo --features ci
+        if: matrix.arch != 'riscv64'
       - run: cargo xtask ci qemu --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} --package hello_world --no-default-features --microvm
         if: matrix.arch == 'x86_64'
       - run: cargo xtask ci qemu --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} --package rusty_demo --features fs --virtiofsd

diff --git a/xtask/src/ci/qemu.rs b/xtask/src/ci/qemu.rs
@@ -112,7 +112,7 @@ impl Qemu {
 			_ => {}
 		}
 
-		let status = qemu.0.wait_timeout(Duration::from_secs(60 * 2))?;
+		let status = qemu.0.wait_timeout(Duration::from_secs(60 * 6))?;
 		let Some(status) = status else {
 			bail!("QEMU timeout")
 		};
@@ -217,7 +217,7 @@ impl Qemu {
 			memory *= 4;
 		}
 		if self.build.cargo_build.artifact.profile() == "dev" {
-			memory *= 4;
+			memory *= 16;
 		}
 		memory *= self.smp;
 		if self.netdev.is_some() {