Skip to content

Commit 5b2c490

Browse files
committed
Update MSRV to 1.67.0
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]>
1 parent 6be0f0a commit 5b2c490

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
uses: ./.github/actions/ci_script
6565
with:
6666
ci-flags: "cargo-check"
67-
rs-version: "1.66.0"
67+
rs-version: "1.67.0"
6868

6969
build-all-providers-stable:
7070
name: Cargo check all-providers (current Rust stable)

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ jobs:
5555
with:
5656
ref: "${{ github.event.inputs.rev }}"
5757
- name: Run the container to execute the coverage script
58-
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
58+
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
5959
- name: Collect coverage results
6060
run: bash <(curl -s https://codecov.io/bash)

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ readme = "README.md"
99
keywords = ["security", "service"]
1010
categories = ["cryptography", "hardware-support"]
1111
edition = "2018"
12-
rust-version = "1.66.0"
12+
rust-version = "1.67.0"
1313

1414
[[bin]]
1515
name = "parsec"

ci.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then
279279
PROVIDERS="trusted-service mbed-crypto tpm pkcs11"
280280
EXCLUDES="fuzz/*,e2e_tests/*,src/providers/cryptoauthlib/*,src/authenticators/jwt_svid_authenticator/*"
281281
UNIT_TEST_FEATURES="unix-peer-credentials-authenticator,direct-authenticator"
282-
# Install tarpaulin
283-
# TODO: Stop using the --version parameter when MSRV is upgraded (>1.66.0)
284-
cargo install cargo-tarpaulin --version 0.26.1 --locked
282+
cargo install cargo-tarpaulin
285283

286284
mkdir -p reports
287285

e2e_tests/docker_image/generate-keys.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
set -xeuf -o pipefail
1010

1111

12-
rustup install 1.66.0
12+
rustup install 1.67.0
1313

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

9999
# Build the service with trusted service provider
100-
cargo +1.66.0 build --features "trusted-service-provider, all-authenticators"
100+
cargo +1.67.0 build --features "trusted-service-provider, all-authenticators"
101101
# Start the service with trusted service provider
102102
./target/debug/parsec -c e2e_tests/provider_cfg/trusted-service/config.toml &
103103
wait_for_process "parsec"
@@ -147,7 +147,7 @@ key_info_manager = "sqlite-manager"
147147
EOF
148148
popd
149149
# Build the service with trusted service provider
150-
cargo +1.66.0 build --features "trusted-service-provider, all-authenticators"
150+
cargo +1.67.0 build --features "trusted-service-provider, all-authenticators"
151151
# Start the service with trusted service provider
152152
./target/debug/parsec -c e2e_tests/provider_cfg/trusted-service/config-sqlite.toml &
153153
wait_for_process "parsec"
@@ -170,7 +170,7 @@ git submodule update --init --recursive
170170
cargo install parsec-tool
171171

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

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

0 commit comments

Comments
 (0)