Skip to content

Commit

Permalink
ci: Parametrise the MSRV
Browse files Browse the repository at this point in the history
Currently, to update the MSRV, several places in the ci.sh script
need to be changed.

 * Create an environment variable to define the MSRV so that only
   one change is needed to update it.

Signed-off-by: Tomás González <tomasagustin.gonzalezorlando@arm.com>
  • Loading branch information
tgonzalezorlandoarm committed Sep 25, 2023
1 parent 304c787 commit d783375
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ setup_mappings() {

# Use the newest version of the Rust toolchain
rustup update
MSRV=1.66.0

# Parse arguments
NO_CARGO_CLEAN=
Expand Down Expand Up @@ -247,12 +248,12 @@ fi
git submodule update --init

if [ "$PROVIDER_NAME" = "coverage" ]; then
rustup toolchain install 1.66.0
rustup toolchain install ${MSRV}
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.66.0 install cargo-tarpaulin
cargo +${MSRV} install cargo-tarpaulin

mkdir -p reports

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

# Start service
RUST_LOG=info cargo +1.66.0 tarpaulin --out Xml --forward --command build --exclude-files="$EXCLUDES" \
RUST_LOG=info cargo +${MSRV} 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 +287,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then
fi

# Start service
RUST_LOG=info cargo +1.66.0 tarpaulin --out Xml --forward --command build --exclude-files="$EXCLUDES" \
RUST_LOG=info cargo +${MSRV} 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 @@ -297,7 +298,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then

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

exit 0
fi
Expand Down Expand Up @@ -332,9 +333,9 @@ if [ "$PROVIDER_NAME" = "cargo-check" ]; then
# - openSUSE Tumbleweed
# - openSUSE Leap 15.4

rustup toolchain install 1.66.0
rustup toolchain install ${MSRV}
# TODO: The "jwt-svid-authenticator" is currently not being used.
RUST_BACKTRACE=1 cargo +1.66.0 check --release --features=all-providers,direct-authenticator,unix-peer-credentials-authenticator
RUST_BACKTRACE=1 cargo +${MSRV} check --release --features=all-providers,direct-authenticator,unix-peer-credentials-authenticator

# Latest stable
rustup toolchain install stable
Expand Down

0 comments on commit d783375

Please sign in to comment.