Skip to content

Commit

Permalink
Update MSRV to Rust 1.60
Browse files Browse the repository at this point in the history
Signed-off-by: Tomás González <tomasagustin.gonzalezorlando@arm.com>
  • Loading branch information
tgonzalezorlandoarm committed Aug 21, 2023
1 parent 51c707b commit af84166
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,14 @@ fi
git submodule update --init

if [ "$PROVIDER_NAME" = "coverage" ]; then
rustup toolchain install 1.57.0
rustup toolchain install 1.60.0
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
cargo +1.57.0 install cargo-tarpaulin
#TODO: Remove the fixed version of cargo-tarpaulin when a new rust version
# is used (and the MSRV gets upgraded).
cargo +1.60.0 install cargo-tarpaulin --version 0.24.0

mkdir -p reports

Expand All @@ -268,7 +270,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then
cp -r $(pwd)/e2e_tests/fake_mappings/* mappings

# Start service
RUST_LOG=info cargo +1.57.0 tarpaulin --out Xml --forward --command build --exclude-files="$EXCLUDES" \
RUST_LOG=info cargo +1.60.0 tarpaulin --out Xml --forward --command build --exclude-files="$EXCLUDES" \
--output-dir $(pwd)/reports/$provider --features="$provider-provider,direct-authenticator" \
--run-types bins --timeout 3600 -- -c $CONFIG_PATH &
wait_for_service
Expand All @@ -286,7 +288,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then
fi

# Start service
RUST_LOG=info cargo +1.57.0 tarpaulin --out Xml --forward --command build --exclude-files="$EXCLUDES" \
RUST_LOG=info cargo +1.60.0 tarpaulin --out Xml --forward --command build --exclude-files="$EXCLUDES" \
--output-dir $(pwd)/reports/$provider --features="$provider-provider,direct-authenticator" \
--run-types bins --timeout 3600 -- -c $CONFIG_PATH &
wait_for_service
Expand All @@ -296,7 +298,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then

# Run unit tests
mkdir -p reports/unit
cargo +1.57.0 tarpaulin --tests --out Xml --features=$UNIT_TEST_FEATURES --exclude-files="$EXCLUDES" --output-dir $(pwd)/reports/unit
cargo +1.60.0 tarpaulin --tests --out Xml --features=$UNIT_TEST_FEATURES --exclude-files="$EXCLUDES" --output-dir $(pwd)/reports/unit

exit 0
fi
Expand Down Expand Up @@ -330,11 +332,10 @@ if [ "$PROVIDER_NAME" = "cargo-check" ]; then
# - RHEL-9 (intend to support in the future)
# - openSUSE Tumbleweed
# - openSUSE Leap 15.4
# The oldest is currently in RHEL9, is 1.58.1.

rustup toolchain install 1.58.1
# The "jwt-svid-authenticator" can not be compiled on 1.58.1
RUST_BACKTRACE=1 cargo +1.58.1 check --release --features=all-providers,direct-authenticator,unix-peer-credentials-authenticator
rustup toolchain install 1.60.0
# TODO: The "jwt-svid-authenticator" is currently not being used.
RUST_BACKTRACE=1 cargo +1.60.0 check --release --features=all-providers,direct-authenticator,unix-peer-credentials-authenticator

# Latest stable
rustup toolchain install stable
Expand Down

0 comments on commit af84166

Please sign in to comment.