diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a8033a2c4..538b86d703 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -148,6 +148,7 @@ jobs: with: repo: hermitcore/rusty-loader file: rusty-loader-x86_64 + target: kernel/ - name: Install virtiofsd run: cargo install virtiofsd - name: rusty_demo with pci-ids and virtiofsd @@ -193,6 +194,7 @@ jobs: with: repo: hermitcore/rusty-loader file: rusty-loader-aarch64 + target: kernel/ - uses: mkroening/rust-toolchain-toml@main - name: Install QEMU run: | @@ -246,11 +248,13 @@ jobs: with: file: rusty-loader-x86_64 repo: hermitcore/rusty-loader + target: kernel/ - name: Download loader (x86_64-fc) uses: dsaltares/fetch-gh-release-asset@master with: file: rusty-loader-x86_64-fc repo: hermitcore/rusty-loader + target: kernel/ - name: Install firecracker run: | # https://github.com/firecracker-microvm/firecracker/blob/7c5fc8707f26c4244d48a747631ab0fb31fc4c39/docs/getting-started.md#getting-a-firecracker-binary diff --git a/xtask/src/ci/firecracker.rs b/xtask/src/ci/firecracker.rs index 9321b05ffd..e051518d2b 100644 --- a/xtask/src/ci/firecracker.rs +++ b/xtask/src/ci/firecracker.rs @@ -20,7 +20,7 @@ impl Firecracker { let config = format!( include_str!("firecracker_vm_config.json"), - kernel_image_path = "../rusty-loader-x86_64-fc", + kernel_image_path = "rusty-loader-x86_64-fc", initrd_path = self.build.image().display() ); eprintln!("firecracker config"); diff --git a/xtask/src/ci/qemu.rs b/xtask/src/ci/qemu.rs index ae4d9322cf..418c725e3f 100644 --- a/xtask/src/ci/qemu.rs +++ b/xtask/src/ci/qemu.rs @@ -54,7 +54,7 @@ impl Qemu { let cmd = cmd!(sh, "qemu-system-{arch}") .args(&["-display", "none"]) .args(&["-serial", "stdio"]) - .args(&["-kernel", format!("../rusty-loader-{arch}").as_ref()]) + .args(&["-kernel", format!("rusty-loader-{arch}").as_ref()]) .args(self.machine_args()) .args(self.cpu_args()) .args(self.smp_args())