diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87df6753..128b59ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4b2eb051..4781f663 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -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) diff --git a/Cargo.toml b/Cargo.toml index 695bafc5..4f5097da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/ci.sh b/ci.sh index e8c12073..f7f2b3e8 100755 --- a/ci.sh +++ b/ci.sh @@ -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 diff --git a/e2e_tests/docker_image/generate-keys.sh b/e2e_tests/docker_image/generate-keys.sh index 82b5fc5e..d340b3e2 100755 --- a/e2e_tests/docker_image/generate-keys.sh +++ b/e2e_tests/docker_image/generate-keys.sh @@ -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 @@ -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" @@ -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" @@ -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