Skip to content

Commit f4ccd3a

Browse files
committed
For analysis, only build OIIO as debug, not dependencies
Signed-off-by: Larry Gritz <[email protected]>
1 parent 14a15e6 commit f4ccd3a

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
fail-fast: false
7777
matrix:
7878
include:
79-
- desc: sonar gcc9/C++14 py39 exr3.1 ocio2.2
79+
- desc: sonar gcc11/C++17 py310 exr3.2 ocio2.3
8080
nametag: static-analysis-sonar
8181
os: ubuntu-latest
8282
container: aswf/ci-osl:2023-clang15
@@ -91,7 +91,7 @@ jobs:
9191
setenvs: export SONAR_SERVER_URL="https://sonarcloud.io"
9292
BUILD_WRAPPER_OUT_DIR=/__w/OpenImageIO/OpenImageIO/bw_output
9393
OIIO_CMAKE_BUILD_WRAPPER="build-wrapper-linux-x86-64 --out-dir /__w/OpenImageIO/OpenImageIO/bw_output"
94-
CMAKE_BUILD_TYPE=Debug
94+
OIIO_CMAKE_BUILD_TYPE=Debug
9595
CMAKE_UNITY_BUILD=OFF
9696
CODECOV=1
9797
CTEST_TEST_TIMEOUT=1200

src/build-scripts/ci-build.bash

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ OIIO_CMAKE_FLAGS="$MY_CMAKE_FLAGS $OIIO_CMAKE_FLAGS"
1212
export OIIO_SRC_DIR=${OIIO_SRC_DIR:=$PWD}
1313
export OIIO_BUILD_DIR=${OIIO_BUILD_DIR:=${OIIO_SRC_DIR}/build}
1414
export OIIO_INSTALL_DIR=${OIIO_INSTALL_DIR:=${OIIO_SRC_DIR}/dist}
15+
export OIIO_CMAKE_BUILD_TYPE=${OIIO_CMAKE_BUILD_TYPE:=${CMAKE_BUILD_TYPE:=Release}}
1516

1617
if [[ "$USE_SIMD" != "" ]] ; then
1718
OIIO_CMAKE_FLAGS="$OIIO_CMAKE_FLAGS -DUSE_SIMD=$USE_SIMD"
@@ -32,7 +33,7 @@ fi
3233

3334
# pushd $OIIO_BUILD_DIR
3435
cmake -S $OIIO_SRC_DIR -B $OIIO_BUILD_DIR -G "$CMAKE_GENERATOR" \
35-
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
36+
-DCMAKE_BUILD_TYPE="${OIIO_CMAKE_BUILD_TYPE}" \
3637
-DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" \
3738
-DCMAKE_INSTALL_PREFIX="$OpenImageIO_ROOT" \
3839
-DPYTHON_VERSION="$PYTHON_VERSION" \

0 commit comments

Comments
 (0)