Merge pull request #296 from hermit-os/microvm-ci

ci: test QEMU microvm
hermit-os · Feb 8, 2024 · af1768f · af1768f
2 parents d8f161e + 6021656
commit af1768f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,6 +80,12 @@ jobs:
         run: cargo xtask ci qemu --target ${{ matrix.target }}
       - name: Run VM (hello_world, release)
         run: cargo xtask ci qemu --target ${{ matrix.target }} --release
+      - name: Run VM (hello_world-microvm, dev)
+        if: matrix.target == 'x86_64' && matrix.os == 'ubuntu-latest'
+        run: cargo xtask ci qemu --target ${{ matrix.target }} --image hello_world-microvm --microvm
+      - name: Run VM (hello_world-microvm, release)
+        if: matrix.target == 'x86_64' && matrix.os == 'ubuntu-latest'
+        run: cargo xtask ci qemu --target ${{ matrix.target }} --image hello_world-microvm --microvm --release
       - name: Run VM (hello_c, dev)
         if: matrix.target == 'x86_64'
         run: cargo xtask ci qemu --target ${{ matrix.target }} --image hello_c
@@ -117,11 +123,15 @@ jobs:
         run: cargo xtask ci qemu --target x86_64 --accel
       - name: Run QEMU (hello_world, release)
         run: cargo xtask ci qemu --target x86_64 --accel --release
+      - name: Run QEMU (hello_world-microvm, dev)
+        run: cargo xtask ci qemu --target x86_64 --accel --image hello_world-microvm --microvm
+      - name: Run QEMU (hello_world-microvm, release)
+        run: cargo xtask ci qemu --target x86_64 --accel --image hello_world-microvm --microvm --release
       - name: Run UEFI (dev)
         run: cargo xtask ci qemu --target x86_64-uefi --accel
       - name: Run UEFI (release)
         run: cargo xtask ci qemu --target x86_64-uefi --accel --release
       - name: Run Firecracker (hello_world, dev)
-        run: cargo xtask ci firecracker --target x86_64-fc --features fc
+        run: cargo xtask ci firecracker --target x86_64-fc --features fc --image hello_world-microvm
       - name: Run Firecracker (hello_world, release)
-        run: cargo xtask ci firecracker --target x86_64-fc --features fc --release
+        run: cargo xtask ci firecracker --target x86_64-fc --features fc --image hello_world-microvm --release
diff --git a/data/x86_64-fc/hello_world → data/x86_64/hello_world-microvm b/data/x86_64-fc/hello_world → data/x86_64/hello_world-microvm
diff --git a/xtask/src/artifact.rs b/xtask/src/artifact.rs
@@ -69,6 +69,6 @@ impl Artifact {
 	}
 
 	pub fn ci_image(&self, image: &str) -> PathBuf {
-		["data", self.target.name(), image].iter().collect()
+		["data", self.target.arch(), image].iter().collect()
 	}
 }