Skip to content

Commit

Permalink
Update MSRV to 1.67.0
Browse files Browse the repository at this point in the history
All the distros with Parsec packages have been updated to newer
Rust versions so bump the MSRV to 1.67.0.
This is needed to avoid the MSRV failure seen while compiling
time-core v0.1.2.

Signed-off-by: Gowtham Suresh Kumar <[email protected]>
  • Loading branch information
gowthamsk-arm committed Sep 2, 2024
1 parent 6be0f0a commit 5b2c490
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
uses: ./.github/actions/ci_script
with:
ci-flags: "cargo-check"
rs-version: "1.66.0"
rs-version: "1.67.0"

build-all-providers-stable:
name: Cargo check all-providers (current Rust stable)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ jobs:
with:
ref: "${{ github.event.inputs.rev }}"
- name: Run the container to execute the coverage script
run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec --security-opt seccomp=unconfined --env RUST_TOOLCHAIN_VERSION=1.66.0 ghcr.io/parallaxsecond/parsec-service-test-all /tmp/parsec/ci.sh coverage
run: docker run -v $(pwd):/tmp/parsec -w /tmp/parsec --security-opt seccomp=unconfined --env RUST_TOOLCHAIN_VERSION=1.67.0 ghcr.io/parallaxsecond/parsec-service-test-all /tmp/parsec/ci.sh coverage
- name: Collect coverage results
run: bash <(curl -s https://codecov.io/bash)
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readme = "README.md"
keywords = ["security", "service"]
categories = ["cryptography", "hardware-support"]
edition = "2018"
rust-version = "1.66.0"
rust-version = "1.67.0"

[[bin]]
name = "parsec"
Expand Down
4 changes: 1 addition & 3 deletions ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then
PROVIDERS="trusted-service mbed-crypto tpm pkcs11"
EXCLUDES="fuzz/*,e2e_tests/*,src/providers/cryptoauthlib/*,src/authenticators/jwt_svid_authenticator/*"
UNIT_TEST_FEATURES="unix-peer-credentials-authenticator,direct-authenticator"
# Install tarpaulin
# TODO: Stop using the --version parameter when MSRV is upgraded (>1.66.0)
cargo install cargo-tarpaulin --version 0.26.1 --locked
cargo install cargo-tarpaulin

mkdir -p reports

Expand Down
8 changes: 4 additions & 4 deletions e2e_tests/docker_image/generate-keys.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
set -xeuf -o pipefail


rustup install 1.66.0
rustup install 1.67.0

wait_for_process() {
while [ -z "$(pgrep $1)" ]; do
Expand Down Expand Up @@ -97,7 +97,7 @@ generate_and_store_keys_for_ondisk_KIM()
mv /tmp/create_keys/parsec/NVChip /tmp/ondisk

# Build the service with trusted service provider
cargo +1.66.0 build --features "trusted-service-provider, all-authenticators"
cargo +1.67.0 build --features "trusted-service-provider, all-authenticators"
# Start the service with trusted service provider
./target/debug/parsec -c e2e_tests/provider_cfg/trusted-service/config.toml &
wait_for_process "parsec"
Expand Down Expand Up @@ -147,7 +147,7 @@ key_info_manager = "sqlite-manager"
EOF
popd
# Build the service with trusted service provider
cargo +1.66.0 build --features "trusted-service-provider, all-authenticators"
cargo +1.67.0 build --features "trusted-service-provider, all-authenticators"
# Start the service with trusted service provider
./target/debug/parsec -c e2e_tests/provider_cfg/trusted-service/config-sqlite.toml &
wait_for_process "parsec"
Expand All @@ -170,7 +170,7 @@ git submodule update --init --recursive
cargo install parsec-tool

# Build service with all providers (trusted-service-provider isn't included)
cargo +1.66.0 build --features "all-providers, all-authenticators"
cargo +1.67.0 build --features "all-providers, all-authenticators"

# Start the service with all providers (trusted-service-provider isn't included)
configure_tpm
Expand Down

0 comments on commit 5b2c490

Please sign in to comment.