Skip to content

Commit 4b26370

Browse files
committed
Try removing old OIIO in the container
Signed-off-by: Larry Gritz <[email protected]>
1 parent 6f55fde commit 4b26370

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.github/workflows/analysis.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
- desc: sonar VP2024 gcc11/C++17 llvm17 py3.11 oiio-rel avx2
8686
nametag: static-analysis-sonar
8787
runner: ubuntu-latest
88-
container: aswftesting/ci-osl:2024-clang17
88+
container: aswf/ci-osl:2024-clang17
8989
cxx_std: 17
9090
openimageio_ver: release
9191
python_ver: "3.11"
@@ -95,6 +95,13 @@ jobs:
9595
coverage: 1
9696
# skip_tests: 1
9797
sonar: 1
98+
depcmds: |
99+
sudo rm -rf /usr/local/include/OpenImageIO ;
100+
sudo rm -rf /usr/local/lib*/cmake/OpenImageIO ;
101+
sudo rm -rf /usr/local/lib*/libOpenImageIO* ;
102+
sudo rm -rf /usr/local/lib*/python3.9/site-packages/OpenImageIO* ;
103+
ls /usr/local/include
104+
# This container's old OIIO interferes with the one we build
98105
setenvs: export xSONAR_SCANNER_VERSION=4.7.0.2747
99106
SONAR_SERVER_URL="https://sonarcloud.io"
100107
BUILD_WRAPPER_OUT_DIR=/__w/OpenShadingLanguage/OpenShadingLanguage/bw_output

.github/workflows/build-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
elif [[ "$RUNNER_OS" == "Windows" ]]; then
145145
src/build-scripts/gh-win-installdeps.bash
146146
fi
147-
- name: Install sonar-scanner and build-wrapper
147+
- name: Install sonar-scanner and build-wrapper
148148
if: inputs.sonar == '1'
149149
uses: sonarsource/sonarcloud-github-c-cpp@e4882e1621ad2fb48dddfa48287411bed34789b1 # v2.0.2
150150
- name: Build

0 commit comments

Comments
 (0)