diff --git a/ci/buildsonarcloud.sh b/ci/buildsonarcloud.sh index 32c287d..eac6b26 100755 --- a/ci/buildsonarcloud.sh +++ b/ci/buildsonarcloud.sh @@ -44,6 +44,6 @@ ctest -VV make gcov # Scan project -/opt/sonar-scanner-4.6.2.2472-linux/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dproject.settings="$REPO_ROOT"/sonar-project.properties -Dsonar.projectBaseDir="$REPO_ROOT" -Dsonar.cfamily.gcov.reportsPath="$BUILD_DIR" +/opt/sonar-scanner-6.2.1.4610-linux-x64/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dproject.settings="$REPO_ROOT"/sonar-project.properties -Dsonar.projectBaseDir="$REPO_ROOT" -Dsonar.cfamily.gcov.reportsPath="$BUILD_DIR" diff --git a/ci/docker/ubuntu/Dockerfile b/ci/docker/ubuntu/Dockerfile index e00cce0..5444281 100644 --- a/ci/docker/ubuntu/Dockerfile +++ b/ci/docker/ubuntu/Dockerfile @@ -9,8 +9,8 @@ RUN apt update && apt install -y wget unzip git python3-jinja2 RUN wget http://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip RUN unzip build-wrapper-linux-x86.zip -d /opt -RUN wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472-linux.zip -RUN unzip sonar-scanner-cli-4.6.2.2472-linux.zip -d /opt +RUN wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.2.1.4610-linux-x64.zip +RUN unzip sonar-scanner-cli-6.2.1.4610-linux-x64.zip -d /opt RUN wget https://github.com/google/or-tools/releases/download/v9.10/or-tools_amd64_ubuntu-24.04_cpp_v9.10.4067.tar.gz RUN tar -C /opt --strip-components=1 -xvf or-tools_amd64_ubuntu-24.04_cpp_v9.10.4067.tar.gz