Skip to content

Commit 9f11e14

Browse files
ludfjigludfjig
committed
Update workspace edition and ci to 2024, with rust version 1.85
Signed-off-by: Ludvig Liljenberg <[email protected]>
1 parent 16c6390 commit 9f11e14

File tree

21 files changed

+38
-28
lines changed

21 files changed

+38
-28
lines changed

Diff for: ‎.devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN SNIPPET="export PROMPT_COMMAND='history -a' && export HISTFILE=/commandhisto
5252

5353
USER $USER
5454

55-
ARG RUST_TOOLCHAIN=1.81.0
55+
ARG RUST_TOOLCHAIN=1.85.0
5656

5757
# Install rust
5858
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \

Diff for: ‎.github/workflows/Benchmarks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- uses: hyperlight-dev/[email protected]
3232
with:
33-
rust-toolchain: "1.81.0"
33+
rust-toolchain: "1.85.0"
3434
env:
3535
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3636

Diff for: ‎.github/workflows/CargoAudit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# TODO: Once the runner image is updated to include the necessary tools (without downloading), we can switch to the common workflow.
2020
- uses: dtolnay/rust-toolchain@master
2121
with:
22-
toolchain: "1.81.0"
22+
toolchain: "1.85.0"
2323

2424
- uses: rustsec/[email protected]
2525
with:

Diff for: ‎.github/workflows/CargoPublish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- uses: hyperlight-dev/[email protected]
3636
with:
37-
rust-toolchain: "1.81.0"
37+
rust-toolchain: "1.85.0"
3838

3939
- name: Check crate versions
4040
shell: bash

Diff for: ‎.github/workflows/CreateDevcontainerImage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
USER: vscode
1717
GROUP: vscode
1818
LLVM_VERSION: 17
19-
RUST_TOOLCHAIN_DEFAULT: 1.81.0
19+
RUST_TOOLCHAIN_DEFAULT: 1.85.0
2020
RUST_TOOLCHAIN_FILE: rust-toolchain.toml
2121

2222
# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.

Diff for: ‎.github/workflows/CreateRelease.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: hyperlight-dev/[email protected]
2525
with:
26-
rust-toolchain: "1.81.0"
26+
rust-toolchain: "1.85.0"
2727
env:
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2929

@@ -43,7 +43,7 @@ jobs:
4343

4444
- uses: hyperlight-dev/[email protected]
4545
with:
46-
rust-toolchain: "1.81.0"
46+
rust-toolchain: "1.85.0"
4747
env:
4848
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4949

@@ -105,7 +105,7 @@ jobs:
105105

106106
- uses: hyperlight-dev/[email protected]
107107
with:
108-
rust-toolchain: "1.81.0"
108+
rust-toolchain: "1.85.0"
109109
env:
110110
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111111

Diff for: ‎.github/workflows/dep_build_guest_binaries.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
- uses: hyperlight-dev/[email protected]
3535
with:
36-
rust-toolchain: "1.81.0"
36+
rust-toolchain: "1.85.0"
3737
env:
3838
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3939

Diff for: ‎.github/workflows/dep_fuzzing.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- uses: hyperlight-dev/[email protected]
3636
with:
37-
rust-toolchain: "1.81.0"
37+
rust-toolchain: "1.85.0"
3838
env:
3939
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4040

Diff for: ‎.github/workflows/dep_rust.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
- uses: hyperlight-dev/[email protected]
5858
with:
59-
rust-toolchain: "1.81.0"
59+
rust-toolchain: "1.85.0"
6060
env:
6161
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6262

Diff for: ‎Cargo.lock

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ exclude = [
2525

2626
[workspace.package]
2727
version = "0.2.0"
28-
edition = "2021"
29-
rust-version = "1.80.0"
28+
edition = "2024"
29+
rust-version = "1.85.0"
3030
license = "Apache-2.0"
3131
homepage = "https://github.com/hyperlight-dev/hyperlight"
3232
repository = "https://github.com/hyperlight-dev/hyperlight"

Diff for: ‎hack/rust-dependabot-patch.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
FROM dependabot/dependabot-script
2-
RUN rustup toolchain install 1.81.0 && rustup default 1.81.0
2+
RUN rustup toolchain install 1.85.0 && rustup default 1.85.0

Diff for: ‎rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "1.81.0"
2+
channel = "1.85.0"

Diff for: ‎src/hyperlight_guest/Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ description = """
1212
Library to build guest applications for hyperlight.
1313
"""
1414

15+
[lints]
16+
workspace = true
17+
1518
[features]
1619
default = ["libc", "printf"]
1720
libc = [] # compile musl libc

Diff for: ‎src/hyperlight_host/src/hyperlight_surrogate/Cargo.toml_temp_name

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "hyperlight_surrogate"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

Diff for: ‎src/hyperlight_testing/Cargo.toml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
[package]
22
name = "hyperlight-testing"
3-
edition = "2021"
3+
version.workspace = true
4+
edition.workspace = true
5+
rust-version.workspace = true
6+
7+
[lints]
8+
workspace = true
49

510
[dependencies]
611
anyhow = "1.0.97"

Diff for: ‎src/tests/rust_guests/callbackguest/Cargo.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/tests/rust_guests/callbackguest/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "callbackguest"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
hyperlight-guest = { path = "../../../hyperlight_guest" }

Diff for: ‎src/tests/rust_guests/dummyguest/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[package]
22
name = "dummyguest"
33
version = "0.4.0"
4-
edition = "2021"
4+
edition = "2024"

Diff for: ‎src/tests/rust_guests/simpleguest/Cargo.lock

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎src/tests/rust_guests/simpleguest/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "simpleguest"
33
version = "0.4.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
hyperlight-guest = { path = "../../../hyperlight_guest" }

0 commit comments

Comments
 (0)