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
Pin importlib-resources version to <2.0.0
[releng/global-jjb.git]
/
shell
/
cmake-sonar.sh
diff --git
a/shell/cmake-sonar.sh
b/shell/cmake-sonar.sh
index
0a41a95
..
ccf17d5
100644
(file)
--- a/
shell/cmake-sonar.sh
+++ b/
shell/cmake-sonar.sh
@@
-21,14
+21,14
@@
make_opts="${MAKE_OPTS:-}"
set -ex -o pipefail
cd /tmp || exit 1
set -ex -o pipefail
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,8
+37,10
@@
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" \
/opt/build-wrapper/build-wrapper-linux-x86-64 --out-dir "$WORKSPACE/bw-output" \
- make
"$make_opts"
+ make
$make_opts
/opt/sonar-scanner/bin/sonar-scanner \
-Dsonar.projectKey="${PROJECT_KEY}" \
/opt/sonar-scanner/bin/sonar-scanner \
-Dsonar.projectKey="${PROJECT_KEY}" \