Skip to content

Commit

Permalink
rust: msrv version bump
Browse files Browse the repository at this point in the history
Update minimum supported rust version (MSRV) to 1.68.2.

Signed-off-by: Erdem Meydanli <meydanli@amazon.com>
  • Loading branch information
meerd committed Mar 20, 2024
1 parent 79a2521 commit a9cd74d
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [1.60.0, stable, nightly]
rust: [1.68.2, stable, nightly]
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@master
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "1.2.3"
authors = ["The AWS Nitro Enclaves Team <aws-nitro-enclaves-devel@amazon.com>"]
edition = "2018"
license = "Apache-2.0"
rust-version = "1.60"
rust-version = "1.68"

[dependencies]
serde = { version = ">=1.0", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![msrv]

[msrv]: https://img.shields.io/badge/MSRV-1.60.0-blue
[msrv]: https://img.shields.io/badge/MSRV-1.68.2-blue

## Nitro Enclaves Command Line Interface (Nitro CLI)

Expand Down
4 changes: 2 additions & 2 deletions SPECS/aws-nitro-enclaves-cli.spec
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ Source0: aws-nitro-enclaves-cli.tar.gz
Source1: nitro-cli-dependencies.tar.gz

BuildRequires: openssl-devel
BuildRequires: rust >= 1.60
BuildRequires: cargo >= 1.60
BuildRequires: rust >= 1.68
BuildRequires: cargo >= 1.68
BuildRequires: make
BuildRequires: llvm
BuildRequires: clang
Expand Down
2 changes: 1 addition & 1 deletion driver-bindings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version = "0.1.0"
authors = ["The AWS Nitro Enclaves Team <aws-nitro-enclaves-devel@amazon.com>"]
edition = "2018"
description = "Rust FFI bindings to Linux Nitro Enclaves driver generated using bindgen."
rust-version = "1.60"
rust-version = "1.68"
2 changes: 1 addition & 1 deletion eif_loader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "eif_loader"
version = "0.1.0"
authors = ["The AWS Nitro Enclaves Team <aws-nitro-enclaves-devel@amazon.com>"]
edition = "2018"
rust-version = "1.60"
rust-version = "1.68"

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

Expand Down
2 changes: 1 addition & 1 deletion enclave_build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "enclave_build"
version = "0.1.0"
authors = ["The AWS Nitro Enclaves Team <aws-nitro-enclaves-devel@amazon.com>"]
edition = "2018"
rust-version = "1.60"
rust-version = "1.68"

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

Expand Down
2 changes: 1 addition & 1 deletion samples/command_executer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "command-executer"
version = "0.1.0"
authors = ["The AWS Nitro Enclaves Team <aws-nitro-enclaves-devel@amazon.com>"]
edition = "2018"
rust-version = "1.60"
rust-version = "1.68"

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

Expand Down
2 changes: 1 addition & 1 deletion tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN cd /tmp/openssl_src/openssl-${OPENSSL_VERSION} && \
make install_sw

# Setup the right rust ver
ENV RUST_VERSION=1.60.0
ENV RUST_VERSION=1.68.2
RUN source $HOME/.cargo/env && \
ARCH=$(uname -m) && \
rustup toolchain install ${RUST_VERSION}-${ARCH}-unknown-linux-gnu && \
Expand Down
2 changes: 1 addition & 1 deletion vsock_proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "vsock-proxy"
version = "0.1.0"
authors = ["The AWS Nitro Enclaves Team <aws-nitro-enclaves-devel@amazon.com>"]
edition = "2018"
rust-version = "1.60"
rust-version = "1.68"

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

Expand Down

0 comments on commit a9cd74d

Please sign in to comment.