Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cargo-tarpaulin version to 0.26.1 #701

Merged
merged 2 commits into from
Sep 25, 2023
Merged

Fix cargo-tarpaulin version to 0.26.1 #701

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d783375
ci: Parametrise the MSRV
tgonzalezorlandoarm Sep 20, 2023
8b34f74
ci/coverage: Fix cargo-tarpaulin version to 0.26.1
tgonzalezorlandoarm Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions ci.sh
View file
Open in desktop
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,13 @@ 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
# TODO: Stop using the --version parameter when MSRV is upgraded.
cargo +${MSRV} install cargo-tarpaulin --version 0.26.1

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.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 +288,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 +299,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 +334,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
Loading