Skip to content

Commit 4ab3648

Browse files
authored
Merge branch 'main' into dependabot/cargo/rust-embed-8.6.0
Signed-off-by: Simon Davies <[email protected]>
2 parents 489ffec + ca4d775 commit 4ab3648

File tree

14 files changed

+316
-376
lines changed

14 files changed

+316
-376
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUN apt-get update \
1414
build-essential \
1515
cmake \
1616
curl \
17+
gdb \
1718
git \
1819
gnupg \
1920
gnuplot \

.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"customizations": {
2424
"vscode": {
2525
"extensions": [
26+
"ms-vscode.cpptools-extension-pack",
2627
"ms-vscode.cmake-tools",
2728
"rust-lang.rust-analyzer",
2829
"vadimcn.vscode-lldb"

.github/workflows/dep_rust.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,25 @@ jobs:
4848
steps:
4949
- uses: actions/checkout@v4
5050

51+
# For rust-fmt
52+
- name: Set up nightly rust
53+
uses: dtolnay/rust-toolchain@nightly
54+
with:
55+
components: rustfmt
56+
5157
- uses: hyperlight-dev/[email protected]
5258
with:
53-
rust-toolchain: "nightly"
59+
rust-toolchain: "1.81.0"
5460
env:
5561
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5662

5763
- name: fmt
5864
run: just fmt-check
5965

6066
- name: clippy
61-
run: just clippy ${{ matrix.config }}
67+
run: |
68+
just clippy ${{ matrix.config }}
69+
just clippy-guests ${{ matrix.config }}
6270
6371
# Does not check for updated Cargo.lock files for test rust guests as this causes an issue with this checkwhen deoendabot updates dependencies in common crates
6472
- name: Ensure up-to-date Cargo.lock

Cargo.lock

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Justfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@ fmt-apply:
138138
clippy target=default-target:
139139
cargo clippy --all-targets --all-features --profile={{ if target == "debug" { "dev" } else { target } }} -- -D warnings
140140

141+
clippy-guests target=default-target:
142+
cd src/tests/rust_guests/simpleguest && cargo clippy --profile={{ if target == "debug" { "dev" } else { target } }} -- -D warnings
143+
cd src/tests/rust_guests/callbackguest && cargo clippy --profile={{ if target == "debug" { "dev" } else { target } }} -- -D warnings
144+
141145
clippy-apply-fix-unix:
142146
cargo clippy --fix --all
143147

0 commit comments

Comments
 (0)