Merge branch 'main' into dependabot/github_actions/crate-ci/typos-1.30.0

hyperlight-dev · Mar 4, 2025 · d9b3f91 · d9b3f91
2 parents c8e7355 + ca4d775
commit d9b3f91
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 23 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -14,6 +14,7 @@ RUN apt-get update \
         build-essential \
         cmake \
         curl \
+        gdb \
         git \
         gnupg \
         gnuplot \

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -23,6 +23,7 @@
   "customizations": {
     "vscode": {
       "extensions": [
+        "ms-vscode.cpptools-extension-pack",
         "ms-vscode.cmake-tools",
         "rust-lang.rust-analyzer",
         "vadimcn.vscode-lldb"

diff --git a/.github/workflows/dep_rust.yml b/.github/workflows/dep_rust.yml
@@ -48,9 +48,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # For rust-fmt 
+      - name: Set up nightly rust 
+        uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: rustfmt
+
       - uses: hyperlight-dev/ci-setup-workflow@v1.2.0
         with:
-          rust-toolchain: "nightly"
+          rust-toolchain: "1.81.0" 
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/hyperlight_host/Cargo.toml b/src/hyperlight_host/Cargo.toml
@@ -29,7 +29,7 @@ paste = "1.0"
 flatbuffers = "25.2.10"
 page_size = "0.6.0"
 termcolor = "1.2.0"
-bitflags = "2.8.0"
+bitflags = "2.9.0"
 lazy_static = "1.4.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -67,7 +67,7 @@ windows = { version = "0.59", features = [
 windows-sys = { version = "0.59", features = ["Win32"] }
 windows-result = "0.3"
 rust-embed = { version = "8.3.0", features = ["debug-embed", "include-exclude", "interpolate-folder-path"] }
-sha256 = "1.4.0"
+sha256 = "1.6.0"
 windows-version = "0.1"
 
 [target.'cfg(unix)'.dependencies]
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ RUN apt-get update \ @@
             build-essential \
             cmake \
             curl \
+            gdb \
             git \
             gnupg \
             gnuplot \
@@ Expand Down @@