From 20aec764c26cd2f8e3db037e6fa51b8a7042a4e6 Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Sun, 28 Mar 2021 13:29:40 -0700 Subject: [PATCH] chore(ci): ensure the right qemu bin is installed (#100) * chore(ci): ensure the right qemu bin is installed Apparently `apt-get install qemu` *used* to provide the `qemu-system-x86_64` binary, but maybe it doesn't anymore? Maybe explicitly trying to install that package will fix CI? Signed-off-by: Eliza Weisman * ahahahaha i committed the wrong file, FML Signed-off-by: Eliza Weisman --- .github/workflows/rust.yml | 4 +++- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 64f4cc39..4a976b05 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -155,7 +155,9 @@ jobs: use-tool-cache: true - uses: actions/checkout@v2 - name: install qemu - run: sudo apt-get update && sudo apt-get install qemu + run: | + sudo apt-get update + sudo apt-get install qemu-system-x86 - name: run tests uses: actions-rs/cargo@v1.0.1 with: diff --git a/Cargo.toml b/Cargo.toml index a99fa5ec..b9e4c45d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ mycelium-util = { path = "util" } rlibc = "1.0" [target.'cfg(target_arch = "x86_64")'.dependencies] -bootloader = {version = "0.9.11", features = ["map_physical_memory"] } +bootloader = {version = "0.9.16", features = ["map_physical_memory"] } hal-x86_64 = { path = "hal-x86_64" } [dependencies.tracing]