From 68a388d4fdae227a29f5089641947a6087c31e6a Mon Sep 17 00:00:00 2001 From: Abdoulbari Zaher <32519851+a-zakir@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:49:17 +0200 Subject: [PATCH] Fix Sonar warning: use compile_commands.json (#2281) --- .github/workflows/sonarcloud.yml | 6 ++++-- sonar-project.properties | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 18955f692e..2b3ca8137a 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -20,6 +20,7 @@ jobs: ORTOOLS_DIR: ${{ github.workspace }}/or-tools # Caching strategy of VCPKG dependencies VCPKG_BINARY_SOURCES: "clear;files,${{ github.workspace }}/vcpkg_cache,readwrite" + BUILD_WRAPPER_OUT_DIR: ${{ github.workspace }}/_build/output # Directory where build-wrapper output will be placed steps: - uses: actions/checkout@v4 @@ -96,11 +97,12 @@ jobs: -DCMAKE_PREFIX_PATH="../install;${{ env.ORTOOLS_DIR }}/install" \ -DBUILD_TESTING=ON \ -DMZ_CODE_COVERAGE=ON \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DPython3_EXECUTABLE='${{ steps.setup-python.outputs.python-path }}' - name: Build run: | - build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/_build/output cmake --build _build --config release -j$(nproc) + build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build _build --config release -j$(nproc) - name: Test and generate coverage continue-on-error: true @@ -116,7 +118,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" + run: sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json" - name: Cache vcpkg binary dir if: always() diff --git a/sonar-project.properties b/sonar-project.properties index bf90dbda19..2a76f458da 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -15,6 +15,5 @@ sonar.sourceEncoding=UTF-8 sonar.exclusions=src/ext/**,src/tests/**,src/ui/** sonar.coverage.exclusions=src/ext/**,src/tests/**,src/analyzer/**,src/distrib/**,src/tools/**,src/ui/** -sonar.cfamily.build-wrapper-output=_build/output sonar.coverageReportPaths=coverage.xml sonar.cfamily.threads=4