Merge branch 'main' into aslr

hermit-os · Jul 28, 2024 · 5f8e495 · 5f8e495
2 parents 4c0bdc0 + 5a1158b
commit 5f8e495
Show file tree

Hide file tree

Showing 12 changed files with 253 additions and 161 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,6 +25,8 @@ jobs:
           cargo test --lib
           cargo test --bins --examples
           cargo test --doc
+    env:
+      RUST_BACKTRACE: 1
 
   integration-tests:
     name: Integration Tests

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,12 +45,11 @@ byte-unit = { version = "5", features = ["byte"] }
 clap = { version = "4.5", features = ["derive", "env"] }
 nix = { version = "0.29", features = ["mman", "pthread", "signal"] }
 core_affinity = "0.8"
-either = "1.12"
+either = "1.13"
 env_logger = "0.11"
 gdbstub = "0.7"
 gdbstub_arch = "0.3"
 hermit-entry = { version = "0.10", features = ["loader"] }
-lazy_static = "1.5"
 libc = "0.2"
 log = "0.4"
 mac_address = "1.1"
@@ -61,6 +60,7 @@ uhyve-interface = { version = "0.1.1", path = "uhyve-interface", features = ["st
 virtio-bindings = { version = "0.2", features = ["virtio-v4_14_0"] }
 rftrace = { version = "0.1", optional = true }
 rftrace-frontend = { version = "0.1", optional = true }
+sysinfo = { version = "0.30.13", default-features = false }
 rand = { version = "0.8.5", optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
@@ -77,7 +77,7 @@ x86_64 = { version = "0.15", default-features = false }
 raw-cpuid = "11"
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
-bitflags = "2.4"
+bitflags = "2.6"
 
 [dev-dependencies]
 assert_fs = "1"