try

Signed-off-by: Larry Gritz <[email protected]>
AcademySoftwareFoundation · Dec 28, 2023 · 5448d52 · 5448d52
1 parent f0b9104
commit 5448d52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -123,7 +123,9 @@ jobs:
         run: |
             which sonar-scanner
             ls -l /__w/OpenImageIO/OpenImageIO/bw_output
-            sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+            echo "BUILD_OUTPUT_DIR is " "${{ env.BUILD_WRAPPER_OUT_DIR }}"
+            # sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+            sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="$BUILD_WRAPPER_OUT_DIR" --define sonar.cfamily.gcov.reportsPath="_coverage"
         # Consult https://docs.sonarcloud.io/advanced-setup/ci-based-analysis/sonarscanner-cli/ for more information and options
 
       # - name: Sonar-scanner

diff --git a/src/build-scripts/ci-build.bash b/src/build-scripts/ci-build.bash
@@ -45,6 +45,9 @@ cp -r build/CMake* build/*.cmake build/cmake-save
 : ${BUILDTARGET:=install}
 if [[ "$BUILDTARGET" != "none" ]] ; then
     echo "Parallel build ${CMAKE_BUILD_PARALLEL_LEVEL} of target ${BUILDTARGET}"
+    if [[ ${OIIO_CMAKE_BUILD_WRAPPER} != "" ]] ; then
+        echo "Using build wrapper '${OIIO_CMAKE_BUILD_WRAPPER}'"
+    fi
     time ${OIIO_CMAKE_BUILD_WRAPPER} cmake --build build --target ${BUILDTARGET} --config ${CMAKE_BUILD_TYPE}
 fi