Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Feat: Allow use of newer JDKs for Sonar scans
[releng/global-jjb.git]
/
shell
/
cmake-sonar.sh
diff --git
a/shell/cmake-sonar.sh
b/shell/cmake-sonar.sh
index
ccf17d5
..
e64ca69
100644
(file)
--- a/
shell/cmake-sonar.sh
+++ b/
shell/cmake-sonar.sh
@@
-20,6
+20,12
@@
make_opts="${MAKE_OPTS:-}"
set -ex -o pipefail
set -ex -o pipefail
+export SET_JDK_VERSION="${SET_JDK_VERSION:-openjdk11}"
+echo "$SET_JDK_VERSION"
+bash <(curl -s https://raw.githubusercontent.com/lfit/releng-global-jjb/master/shell/update-java-alternatives.sh)
+# shellcheck disable=SC1091
+source /tmp/java.env
+
cd /tmp || exit 1
wget -q -O /tmp/sonar-scan.zip \
"https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip"
cd /tmp || exit 1
wget -q -O /tmp/sonar-scan.zip \
"https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip"