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: Add support for Ubuntu 20.04 and Docker
[releng/global-jjb.git]
/
shell
/
cmake-sonar.sh
diff --git
a/shell/cmake-sonar.sh
b/shell/cmake-sonar.sh
index
cd7ee71
..
e64ca69
100644
(file)
--- a/
shell/cmake-sonar.sh
+++ b/
shell/cmake-sonar.sh
@@
-20,15
+20,21
@@
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
cd /tmp || exit 1
-wget -O /tmp/sonar-scan.zip \
+wget -
q -
O /tmp/sonar-scan.zip \
"https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip"
"https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip"
-unzip sonar-scan.zip
+unzip
-q
sonar-scan.zip
sudo mv sonar-scanner-* /opt/sonar-scanner
sudo mv sonar-scanner-* /opt/sonar-scanner
-wget -O /tmp/bw.zip \
+wget -
q -
O /tmp/bw.zip \
"https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip"
"https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip"
-unzip bw.zip
+unzip
-q
bw.zip
sudo mv build-wrapper-* /opt/build-wrapper
mkdir -p "$build_dir"
sudo mv build-wrapper-* /opt/build-wrapper
mkdir -p "$build_dir"
@@
-37,13
+43,15
@@
cd "$build_dir" || exit 1
# shellcheck disable=SC2086
eval cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" $cmake_opts ..
# shellcheck disable=SC2086
eval cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" $cmake_opts ..
+# $make_opts may be empty.
+# shellcheck disable=SC2086
/opt/build-wrapper/build-wrapper-linux-x86-64 --out-dir "$WORKSPACE/bw-output" \
make $make_opts
/opt/sonar-scanner/bin/sonar-scanner \
/opt/build-wrapper/build-wrapper-linux-x86-64 --out-dir "$WORKSPACE/bw-output" \
make $make_opts
/opt/sonar-scanner/bin/sonar-scanner \
- -Dsonar.projectKey=
${PROJECT_KEY}
\
- -Dsonar.organization=
${PROJECT_ORGANIZATION}
\
+ -Dsonar.projectKey=
"${PROJECT_KEY}"
\
+ -Dsonar.organization=
"${PROJECT_ORGANIZATION}"
\
-Dsonar.sources=. \
-Dsonar.cfamily.build-wrapper-output="$WORKSPACE/bw-output" \
-Dsonar.sources=. \
-Dsonar.cfamily.build-wrapper-output="$WORKSPACE/bw-output" \
- -Dsonar.host.url=
${SONAR_HOST_URL}
\
- -Dsonar.login=
${API_TOKEN}
+ -Dsonar.host.url=
"${SONAR_HOST_URL}"
\
+ -Dsonar.login=
"${API_TOKEN}"