From 42577f56f463b51f642d84adcc6265f360f4bc2e Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Thu, 26 Dec 2024 11:27:21 -0800 Subject: [PATCH 1/2] Fail CI if Cargo.lock is not up-to-date Signed-off-by: Ludvig Liljenberg --- .github/workflows/dep_rust.yml | 6 ++++++ Cargo.lock | 1 + 2 files changed, 7 insertions(+) diff --git a/.github/workflows/dep_rust.yml b/.github/workflows/dep_rust.yml index f31807903..2af35bc06 100644 --- a/.github/workflows/dep_rust.yml +++ b/.github/workflows/dep_rust.yml @@ -46,6 +46,12 @@ jobs: - name: clippy run: just clippy ${{ matrix.config }} + - name: Ensure up-to-date Cargo.lock + run: | + cargo fetch --locked + cd src/tests/rust_guests/simpleguest/ && cargo fetch --locked + cd src/tests/rust_guests/callbackguest/ && cargo fetch --locked + - name: Get gh action service name if: ${{ (runner.os == 'Windows' )}} run: (Get-Service actions.runner.*) | Foreach { $_.Name, $_.UserName, $_.ServiceType } diff --git a/Cargo.lock b/Cargo.lock index 707a19636..84c050485 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1071,6 +1071,7 @@ dependencies = [ "buddy_system_allocator", "cc", "cfg-if", + "glob", "hyperlight-common", "log", "serde_json", From 04c661dab6baba146fe10083839a9194e1fdb0b3 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Thu, 26 Dec 2024 11:41:42 -0800 Subject: [PATCH 2/2] Update simpleguest and callbackguest Cargo.lock Signed-off-by: Ludvig Liljenberg --- .github/workflows/dep_rust.yml | 4 ++-- src/tests/rust_guests/callbackguest/Cargo.lock | 15 +++++++++++---- src/tests/rust_guests/simpleguest/Cargo.lock | 15 +++++++++++---- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dep_rust.yml b/.github/workflows/dep_rust.yml index 2af35bc06..9ec80eae2 100644 --- a/.github/workflows/dep_rust.yml +++ b/.github/workflows/dep_rust.yml @@ -49,8 +49,8 @@ jobs: - name: Ensure up-to-date Cargo.lock run: | cargo fetch --locked - cd src/tests/rust_guests/simpleguest/ && cargo fetch --locked - cd src/tests/rust_guests/callbackguest/ && cargo fetch --locked + cargo fetch --manifest-path src/tests/rust_guests/simpleguest/Cargo.toml --locked + cargo fetch --manifest-path src/tests/rust_guests/callbackguest/Cargo.toml --locked - name: Get gh action service name if: ${{ (runner.os == 'Windows' )}} diff --git a/src/tests/rust_guests/callbackguest/Cargo.lock b/src/tests/rust_guests/callbackguest/Cargo.lock index ff2522cce..b2d029e52 100644 --- a/src/tests/rust_guests/callbackguest/Cargo.lock +++ b/src/tests/rust_guests/callbackguest/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.91" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "autocfg" @@ -39,9 +39,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.31" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" +checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" dependencies = [ "shlex", ] @@ -62,6 +62,12 @@ dependencies = [ "rustc_version", ] +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "heck" version = "0.5.0" @@ -86,6 +92,7 @@ dependencies = [ "buddy_system_allocator", "cc", "cfg-if", + "glob", "hyperlight-common", "log", "serde_json", diff --git a/src/tests/rust_guests/simpleguest/Cargo.lock b/src/tests/rust_guests/simpleguest/Cargo.lock index f8df7b2ae..0930b6acb 100644 --- a/src/tests/rust_guests/simpleguest/Cargo.lock +++ b/src/tests/rust_guests/simpleguest/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.91" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "autocfg" @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.31" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" +checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" dependencies = [ "shlex", ] @@ -54,6 +54,12 @@ dependencies = [ "rustc_version", ] +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + [[package]] name = "heck" version = "0.5.0" @@ -78,6 +84,7 @@ dependencies = [ "buddy_system_allocator", "cc", "cfg-if", + "glob", "hyperlight-common", "log", "serde_json",