X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fcmake-sonarqube.sh;h=d335419d70513342d2ff485f2c35db02e8e22048;hb=04547fcca5cabd3d9ad24fced4a0cf268d789296;hp=0dd2cf554824d2961cfd734e14e9932aaa4aa093;hpb=b55451a53da28d40c62de5cae462302a32fe4c31;p=releng%2Fglobal-jjb.git diff --git a/shell/cmake-sonarqube.sh b/shell/cmake-sonarqube.sh index 0dd2cf55..d335419d 100644 --- a/shell/cmake-sonarqube.sh +++ b/shell/cmake-sonarqube.sh @@ -25,6 +25,15 @@ wget -q -O bw.zip https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip unzip -q bw.zip sudo mv build-wrapper-* /opt/build-wrapper + +export SET_JDK_VERSION="${SET_JDK_VERSION:-openjdk11}" +echo "$SET_JDK_VERSION" +GITHUB_RAW_BASE_URL="https://raw.githubusercontent.com" +GITHUB_FILE="lfit/releng-global-jjb/master/shell/update-java-alternatives.sh" +bash <(curl -s "${GITHUB_RAW_BASE_URL}/${GITHUB_FILE}") +# shellcheck disable=SC1091 +source /tmp/java.env + mkdir -p "$build_dir" cd "$build_dir" || exit 1 @@ -34,6 +43,7 @@ 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 "$build_wrap_dir" make $make_opts +/opt/build-wrapper/build-wrapper-linux-x86-64 --out-dir "$build_wrap_dir" \ + make $make_opts echo "---> cmake-sonarqube.sh ends"