From 7e37d2c95e19966ba80e4669df8f321f1d534127 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 20:15:33 +0000 Subject: [PATCH 1/2] Bump tempfile from 3.14.0 to 3.15.0 (#131) --- Cargo.lock | 5 +++-- src/hyperlight_host/Cargo.toml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab14586d..e4c47dd2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2554,12 +2554,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", "fastrand", + "getrandom", "once_cell", "rustix", "windows-sys 0.59.0", diff --git a/src/hyperlight_host/Cargo.toml b/src/hyperlight_host/Cargo.toml index 72fe798e..701cbb70 100644 --- a/src/hyperlight_host/Cargo.toml +++ b/src/hyperlight_host/Cargo.toml @@ -45,7 +45,7 @@ crossbeam-channel = "0.5.14" thiserror = "2.0.7" prometheus = "0.13.3" strum = { version = "0.26", features = ["derive"] } -tempfile = { version = "3.10", optional = true } +tempfile = { version = "3.15", optional = true } serde_yaml = "0.9" anyhow = "1.0" @@ -82,7 +82,7 @@ signal-hook-registry = "1.4.1" envy = { version = "0.4.2" } serde = "1.0" proptest = "1.2.0" -tempfile = "3.8.0" +tempfile = "3.15.0" crossbeam-queue = "0.3.12" tracing-serde = "0.2.0" serial_test = "3.1.1" From 432c6a5b545b51490a7cd1feadea754fae00c4d2 Mon Sep 17 00:00:00 2001 From: Ludvig Liljenberg Date: Thu, 16 Jan 2025 03:28:24 -0800 Subject: [PATCH 2/2] Fail CI if Cargo.lock is not up-to-date (#126) * Fail CI if Cargo.lock is not up-to-date Signed-off-by: Ludvig Liljenberg * Update simpleguest and callbackguest Cargo.lock Signed-off-by: Ludvig Liljenberg --------- Signed-off-by: Ludvig Liljenberg --- .github/workflows/dep_rust.yml | 6 ++++++ src/tests/rust_guests/callbackguest/Cargo.lock | 15 +++++++++++---- src/tests/rust_guests/simpleguest/Cargo.lock | 15 +++++++++++---- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dep_rust.yml b/.github/workflows/dep_rust.yml index f3180790..9ec80eae 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 + 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' )}} run: (Get-Service actions.runner.*) | Foreach { $_.Name, $_.UserName, $_.ServiceType } diff --git a/src/tests/rust_guests/callbackguest/Cargo.lock b/src/tests/rust_guests/callbackguest/Cargo.lock index ff2522cc..b2d029e5 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 f8df7b2a..0930b6ac 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",