Try removing old OIIO in the container

Signed-off-by: Larry Gritz <lg@larrygritz.com>
AcademySoftwareFoundation · Jan 25, 2025 · 71976c5 · 71976c5
1 parent 6f55fde
commit 71976c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -85,7 +85,7 @@ jobs:
           - desc: sonar VP2024 gcc11/C++17 llvm17 py3.11 oiio-rel avx2
             nametag: static-analysis-sonar
             runner: ubuntu-latest
-            container: aswftesting/ci-osl:2024-clang17
+            container: aswf/ci-osl:2024-clang17
             cxx_std: 17
             openimageio_ver: release
             python_ver: "3.11"
@@ -95,6 +95,15 @@ jobs:
             coverage: 1
             # skip_tests: 1
             sonar: 1
+            depcmds: |
+                find /usr/local -name "*OpenImageIO*" --print ;
+                sudo rm -rf /usr/local/include/OpenImageIO ;
+                sudo rm -rf /usr/local/lib*/cmake/OpenImageIO ;
+                sudo rm -rf /usr/local/lib*/libOpenImageIO* ;
+                sudo rm -rf /usr/local/share/cmake/OpenImageIO ;
+                sudo rm -rf /usr/local/lib*/python3.9/site-packages/OpenImageIO* ;
+                ls /usr/local/include
+                # This container's old OIIO interferes with the one we build
             setenvs: export xSONAR_SCANNER_VERSION=4.7.0.2747
                             SONAR_SERVER_URL="https://sonarcloud.io"
                             BUILD_WRAPPER_OUT_DIR=/__w/OpenShadingLanguage/OpenShadingLanguage/bw_output

diff --git a/.github/workflows/build-steps.yml b/.github/workflows/build-steps.yml
@@ -144,7 +144,7 @@ jobs:
             elif [[ "$RUNNER_OS" == "Windows" ]]; then
                 src/build-scripts/gh-win-installdeps.bash
             fi
-      - name:  Install sonar-scanner and build-wrapper
+      - name: Install sonar-scanner and build-wrapper
         if: inputs.sonar == '1'
         uses: sonarsource/sonarcloud-github-c-cpp@e4882e1621ad2fb48dddfa48287411bed34789b1 # v2.0.2
       - name: Build