Skip to content

Commit 56d69c9

Browse files
authored
Merge pull request #573 from ionut-arm/fix-codecov-build
Fix codecov build
2 parents 62901b0 + 962ceb2 commit 56d69c9

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

ci.sh

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,29 +193,33 @@ fi
193193
git submodule update --init
194194

195195
if [ "$PROVIDER_NAME" = "coverage" ]; then
196-
rustup toolchain install 1.51.0
197-
PROVIDERS="mbed-crypto tpm pkcs11" # trusted-service not supported because of a segfault when the service stops; see: https://github.com/parallaxsecond/parsec/issues/349
198-
EXCLUDES="fuzz/*,e2e_tests/*,src/providers/cryptoauthlib/*,src/providers/trusted_service/*,src/authenticators/jwt_svid_authenticator/*"
196+
rustup toolchain install 1.57.0
197+
PROVIDERS="trusted-service mbed-crypto tpm pkcs11"
198+
EXCLUDES="fuzz/*,e2e_tests/*,src/providers/cryptoauthlib/*,src/authenticators/jwt_svid_authenticator/*"
199+
UNIT_TEST_FEATURES="unix-peer-credentials-authenticator,direct-authenticator"
199200
# Install tarpaulin
200-
cargo +1.51.0 install cargo-tarpaulin
201+
cargo +1.57.0 install cargo-tarpaulin
201202

202203
mkdir -p reports
203204

204205
for provider in $PROVIDERS; do
205206
# Set up run
206207
PROVIDER_NAME=$provider
207208
TEST_FEATURES="--features=$provider-provider"
209+
UNIT_TEST_FEATURES="$UNIT_TEST_FEATURES,$provider-provider"
208210
cp $(pwd)/e2e_tests/provider_cfg/$provider/config.toml $CONFIG_PATH
209211
mkdir -p reports/$provider
210212

211213
cp -r /tmp/mappings/ .
212214
cp -r $(pwd)/e2e_tests/fake_mappings/* mappings
213215
if [ "$PROVIDER_NAME" = "mbed-crypto" ]; then
214216
cp /tmp/*.psa_its .
217+
elif [ "$PROVIDER_NAME" = "trusted-service" ]; then
218+
rm -f ./*.psa_its
215219
fi
216220

217221
# Start service
218-
RUST_LOG=info cargo +1.51.0 tarpaulin --out Xml --forward --command build --exclude-files="$EXCLUDES" \
222+
RUST_LOG=info cargo +1.57.0 tarpaulin --out Xml --forward --command build --exclude-files="$EXCLUDES" \
219223
--output-dir $(pwd)/reports/$provider --features="$provider-provider,direct-authenticator" \
220224
--run-types bins --timeout 3600 -- -c $CONFIG_PATH &
221225
wait_for_service
@@ -228,8 +232,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then
228232

229233
# Run unit tests
230234
mkdir -p reports/unit
231-
cargo +1.51.0 tarpaulin --tests --out Xml --features="all-providers,unix-peer-credentials-authenticator,direct-authenticator" \
232-
--exclude-files="$EXCLUDES" --output-dir $(pwd)/reports/unit
235+
cargo +1.57.0 tarpaulin --tests --out Xml --features=$UNIT_TEST_FEATURES --exclude-files="$EXCLUDES" --output-dir $(pwd)/reports/unit
233236

234237
exit 0
235238
fi

0 commit comments

Comments
 (0)