File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change 42
42
run : ${GITHUB_ACTION_PATH}/run-sonar-scanner.sh ${{ inputs.args }}
43
43
shell : bash
44
44
env :
45
- INPUT_PROJECTBASEDIR : ${{ inputs.projectBaseDir }}
45
+ INPUT_PROJECTBASEDIR : ${{ inputs.projectBaseDir }}
46
+ SONAR_SCANNER_JRE : ${RUNNER_TEMP}/sonar-scanner-cli-${{ inputs.scannerVersion }}-${{ runner.os }}-${{ runner.arch }}/jre
Original file line number Diff line number Diff line change @@ -25,11 +25,11 @@ if [[ -n "${SONAR_ROOT_CERT}" ]]; then
25
25
echo " Adding SSL certificate to the Scanner truststore"
26
26
rm -f $RUNNER_TEMP /tmpcert.pem
27
27
echo " ${SONAR_ROOT_CERT} " > $RUNNER_TEMP /tmpcert.pem
28
- # Use keytool for now, as SonarQube 11 .6 won 't support openssl generated keystores
28
+ # Use keytool for now, as SonarQube 10 .6 and below doesn 't support openssl generated keystores
29
29
# keytool require a password > 6 characters, so we wan't use the default password 'sonar'
30
30
store_pass=changeit
31
31
mkdir -p ~ /.sonar/ssl
32
- keytool -storetype PKCS12 -keystore ~ /.sonar/ssl/truststore.p12 -storepass $store_pass -noprompt -trustcacerts -importcert -alias sonar -file $RUNNER_TEMP /tmpcert.pem
32
+ SONAR_SCANNER_JRE/bin/java sun.security.tools. keytool.Main -storetype PKCS12 -keystore ~ /.sonar/ssl/truststore.p12 -storepass $store_pass -noprompt -trustcacerts -importcert -alias sonar -file $RUNNER_TEMP /tmpcert.pem
33
33
scanner_args+=(" -Dsonar.scanner.truststorePassword=$store_pass " )
34
34
fi
35
35
You can’t perform that action at this time.
0 commit comments