Skip to content

Commit 70227b6

Browse files
committed
[ci] fix jarsigner invocation — CLASSPATH env var and correct providerArg
1 parent 2de2ecd commit 70227b6

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

.github/workflows/ci-oidc-smoke.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,11 @@ jobs:
8080
-Dartifact=com.azure:azure-security-keyvault-jca:2.10.0:jar
8181
fi
8282
ls -la "$KV_JCA_JAR"
83-
jarsigner \
83+
CLASSPATH="$KV_JCA_JAR" jarsigner \
8484
-keystore NONE \
8585
-storetype AzureKeyVault \
8686
-providerClass com.azure.security.keyvault.jca.KeyVaultJcaProvider \
87-
-providerArg "-J-Dazure.keyvault.uri=${AZURE_KEYVAULT_URI}" \
88-
-J-cp -J"$KV_JCA_JAR" \
87+
-providerArg "${AZURE_KEYVAULT_URI}" \
8988
-tsa http://timestamp.sectigo.com/ \
9089
/tmp/smoke/smoke.jar "$AZURE_KEYVAULT_CERT_NAME"
9190

.github/workflows/ci-release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,11 @@ jobs:
236236
-Dartifact=com.azure:azure-security-keyvault-jca:2.10.0:jar
237237
fi
238238
CERT_NAME="${{ vars.AZURE_KEYVAULT_CERT_NAME }}"
239-
jarsigner \
239+
CLASSPATH="$KV_JCA_JAR" jarsigner \
240240
-keystore NONE \
241241
-storetype AzureKeyVault \
242242
-providerClass com.azure.security.keyvault.jca.KeyVaultJcaProvider \
243-
-providerArg "-J-Dazure.keyvault.uri=${AZURE_KEYVAULT_URI}" \
244-
-J-cp -J"$KV_JCA_JAR" \
243+
-providerArg "${AZURE_KEYVAULT_URI}" \
245244
-tsa http://timestamp.sectigo.com/ \
246245
"$JAR" "$CERT_NAME"
247246
jarsigner -verify -strict "$JAR"

0 commit comments

Comments
 (0)