From ad181fdb3c1b972d074aa5b3bfa63c5c2822d1d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Tue, 26 Nov 2024 17:57:02 +0100 Subject: [PATCH 1/3] ci: explicitly set up stable Rust toolchain --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d85c07c9..e048efde8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,6 +69,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: true + - uses: dtolnay/rust-toolchain@stable - uses: mkroening/rust-toolchain-toml@main - name: Download loader run: gh release download --repo hermit-os/loader --pattern hermit-loader-x86_64 From c81034fd667a8b3ad1cbe7e1ebd7256ce508fbdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Tue, 26 Nov 2024 18:04:52 +0100 Subject: [PATCH 2/3] ci: add Cargo binaries to path --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e048efde8..3353863d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,6 +70,7 @@ jobs: with: submodules: true - uses: dtolnay/rust-toolchain@stable + - run: echo "$CARGO_HOME/bin" >> "$GITHUB_PATH" - uses: mkroening/rust-toolchain-toml@main - name: Download loader run: gh release download --repo hermit-os/loader --pattern hermit-loader-x86_64 From 7e646bc84db7a1b1b25b81e2eec1970872b884ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Tue, 26 Nov 2024 18:05:31 +0100 Subject: [PATCH 3/3] ci: remove `--verbose` from Uhyve call --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3353863d9..12a479b2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: lscpu kvm-ok - name: Test debug version (Uhyve) - run: uhyve --verbose -c 1 target/x86_64-unknown-hermit/debug/rusty_demo + run: uhyve -c 1 target/x86_64-unknown-hermit/debug/rusty_demo env: RUST_LOG: debug - name: Test debug profile (Qemu) @@ -96,7 +96,7 @@ jobs: - name: Build release profile run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo --release - name: Test release version (Uhyve) - run: uhyve --verbose -c 1 target/x86_64-unknown-hermit/release/rusty_demo + run: uhyve -c 1 target/x86_64-unknown-hermit/release/rusty_demo env: RUST_LOG: debug - name: Test release profile (Qemu)