Skip to content

Commit 87998bf

Browse files
remiaremia
committed
Debug
1 parent 15a40ef commit 87998bf

File tree

5 files changed

+27
-48
lines changed

5 files changed

+27
-48
lines changed

‎.github/workflows/dependencies_latest.yml‎

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ jobs:
2727
# ---------------------------------------------------------------------------
2828

2929
linux_latest:
30-
name: 'Linux CentOS 7 VFX CY${{ matrix.vfx-cy }} latest
30+
name: 'Linux VFX CY${{ matrix.vfx-cy }} latest
3131
<${{ matrix.compiler-desc }}
3232
cxx=${{ matrix.cxx-standard }},
3333
docs=${{ matrix.build-docs }}>'
3434
# Don't run on OCIO forks
35-
if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
36-
# GH-hosted VM. The build runs in CentOS 7 'container' defined below.
35+
# if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
36+
# GH-hosted VM. The build runs in ASWF 'container' defined below.
3737
runs-on: ubuntu-latest
3838
container:
3939
# DockerHub: https://hub.docker.com/u/aswf
4040
# Source: https://github.com/AcademySoftwareFoundation/aswf-docker
41-
image: aswf/ci-base:${{ matrix.vfx-cy }}
41+
image: aswf/ci-base:${{ matrix.vfx-cy }}.1
4242
strategy:
4343
matrix:
4444
build: [1, 2, 3, 4]
@@ -53,17 +53,15 @@ jobs:
5353
cxx-compiler: g++
5454
cc-compiler: gcc
5555
compiler-desc: GCC
56-
vfx-cy: 2022
57-
use-oiio: 'ON'
56+
vfx-cy: 2025
5857
- build: 2
5958
build-docs: 'OFF'
6059
build-openfx: 'OFF'
6160
cxx-standard: 17
6261
cxx-compiler: g++
6362
cc-compiler: gcc
6463
compiler-desc: GCC
65-
vfx-cy: 2021
66-
use-oiio: 'OFF'
64+
vfx-cy: 2024
6765
# -------------------------------------------------------------------
6866
# Clang
6967
# -------------------------------------------------------------------
@@ -74,17 +72,15 @@ jobs:
7472
cxx-compiler: clang++
7573
cc-compiler: clang
7674
compiler-desc: Clang
77-
vfx-cy: 2022
78-
use-oiio: 'OFF'
75+
vfx-cy: 2025
7976
- build: 4
8077
build-docs: 'ON'
8178
build-openfx: 'ON'
8279
cxx-standard: 17
8380
cxx-compiler: clang++
8481
cc-compiler: clang
8582
compiler-desc: Clang
86-
vfx-cy: 2021
87-
use-oiio: 'ON'
83+
vfx-cy: 2024
8884
env:
8985
CXX: ${{ matrix.cxx-compiler }}
9086
CC: ${{ matrix.cc-compiler }}
@@ -100,9 +96,6 @@ jobs:
10096
run: |
10197
EXT_PATH=/usr/local
10298
echo "EXT_PATH=$EXT_PATH" >> $GITHUB_ENV
103-
- name: Install indirect dependencies
104-
run: |
105-
share/ci/scripts/multi/install_pugixml.sh latest
10699
- name: Install fixed ext package versions
107100
# Minizip-ng depends on ZLIB. ZLIB must be installed first.
108101
run: |
@@ -117,8 +110,6 @@ jobs:
117110
run: |
118111
share/ci/scripts/multi/install_imath.sh latest $EXT_PATH
119112
share/ci/scripts/multi/install_openexr.sh latest $EXT_PATH
120-
share/ci/scripts/multi/install_oiio.sh latest $EXT_PATH
121-
share/ci/scripts/multi/install_osl.sh latest $EXT_PATH
122113
share/ci/scripts/multi/install_openfx.sh latest $EXT_PATH
123114
- name: Create build directories
124115
run: |
@@ -135,8 +126,7 @@ jobs:
135126
-DOCIO_BUILD_GPU_TESTS=OFF \
136127
-DOCIO_INSTALL_EXT_PACKAGES=NONE \
137128
-DOCIO_WARNING_AS_ERROR=OFF \
138-
-DPython_EXECUTABLE=$(which python) \
139-
-DOCIO_USE_OIIO_FOR_APPS=${{ matrix.use-oiio }}
129+
-DPython_EXECUTABLE=$(which python)
140130
working-directory: _build
141131
- name: Build
142132
run: |
@@ -169,7 +159,7 @@ jobs:
169159
docs=${{ matrix.build-docs }},
170160
python=${{ matrix.python-version }}>'
171161
# Don't run on OCIO forks
172-
if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
162+
# if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
173163
runs-on: macos-latest
174164
strategy:
175165
matrix:
@@ -180,13 +170,11 @@ jobs:
180170
build-openfx: 'ON'
181171
cxx-standard: 20
182172
python-version: '3.13'
183-
use-oiio: 'ON'
184173
- build: 2
185174
build-docs: 'ON'
186175
build-openfx: 'ON'
187176
cxx-standard: 17
188177
python-version: '3.9'
189-
use-oiio: 'OFF'
190178
steps:
191179
- name: Setup Python
192180
uses: actions/setup-python@v5
@@ -203,11 +191,6 @@ jobs:
203191
run: |
204192
EXT_PATH=/usr/local
205193
echo "EXT_PATH=$EXT_PATH" >> $GITHUB_ENV
206-
- name: Install indirect dependencies
207-
run: |
208-
share/ci/scripts/macos/install_bison.sh latest
209-
share/ci/scripts/macos/install_boost.sh latest
210-
share/ci/scripts/multi/install_pugixml.sh latest $EXT_PATH
211194
- name: Install fixed ext package versions
212195
# Minizip-ng depends on ZLIB. ZLIB must be installed first.
213196
run: |
@@ -222,8 +205,6 @@ jobs:
222205
run: |
223206
share/ci/scripts/multi/install_imath.sh latest $EXT_PATH
224207
share/ci/scripts/multi/install_openexr.sh latest $EXT_PATH
225-
share/ci/scripts/multi/install_oiio.sh latest $EXT_PATH
226-
share/ci/scripts/multi/install_osl.sh latest $EXT_PATH
227208
share/ci/scripts/multi/install_openfx.sh latest $EXT_PATH
228209
- name: Create build directories
229210
run: |
@@ -240,8 +221,7 @@ jobs:
240221
-DOCIO_BUILD_GPU_TESTS=OFF \
241222
-DOCIO_INSTALL_EXT_PACKAGES=NONE \
242223
-DOCIO_WARNING_AS_ERROR=OFF \
243-
-DPython_EXECUTABLE=$(which python) \
244-
-DOCIO_USE_OIIO_FOR_APPS=${{ matrix.use-oiio }}
224+
-DPython_EXECUTABLE=$(which python)
245225
working-directory: _build
246226
- name: Build
247227
run: |
@@ -274,7 +254,7 @@ jobs:
274254
docs=${{ matrix.build-docs }},
275255
python=${{ matrix.python-version }}>'
276256
# Don't run on OCIO forks
277-
if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
257+
# if: github.repository == 'AcademySoftwareFoundation/OpenColorIO'
278258
runs-on: windows-latest
279259
strategy:
280260
matrix:
@@ -323,14 +303,6 @@ jobs:
323303
run: |
324304
vcpkg install zlib:x64-windows
325305
vcpkg install tiff:x64-windows
326-
vcpkg install boost-asio:x64-windows
327-
vcpkg install boost-container:x64-windows
328-
vcpkg install boost-filesystem:x64-windows
329-
vcpkg install boost-math:x64-windows
330-
vcpkg install boost-stacktrace:x64-windows
331-
vcpkg install boost-system:x64-windows
332-
vcpkg install boost-thread:x64-windows
333-
share/ci/scripts/multi/install_pugixml.sh latest $EXT_PATH
334306
shell: bash
335307
- name: Install fixed ext package versions
336308
# Minizip-ng depends on ZLIB. ZLIB must be installed first.
@@ -348,7 +320,6 @@ jobs:
348320
run: |
349321
share/ci/scripts/multi/install_imath.sh latest $EXT_PATH
350322
share/ci/scripts/multi/install_openexr.sh latest $EXT_PATH
351-
share/ci/scripts/multi/install_oiio.sh latest $EXT_PATH
352323
share/ci/scripts/multi/install_openfx.sh latest $EXT_PATH
353324
shell: bash
354325
- name: Create build directories
@@ -369,8 +340,7 @@ jobs:
369340
-DOCIO_INSTALL_EXT_PACKAGES=NONE \
370341
-DOCIO_WARNING_AS_ERROR=OFF \
371342
-DPython_EXECUTABLE=$(which python) \
372-
-DOCIO_BUILD_PYTHON=OFF \
373-
-DOCIO_USE_OIIO_FOR_APPS=${{ matrix.use-oiio }}
343+
-DOCIO_BUILD_PYTHON=OFF
374344
shell: bash
375345
working-directory: _build
376346
- name: Build

‎.github/workflows/wheel_workflow.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
# github.event_name != 'schedule' ||
7777
# github.repository == 'AcademySoftwareFoundation/OpenColorIO'
7878
strategy:
79+
fail-fast: false
7980
matrix:
8081
include:
8182
# -------------------------------------------------------------------
@@ -165,6 +166,7 @@ jobs:
165166
# github.event_name != 'schedule' ||
166167
# github.repository == 'AcademySoftwareFoundation/OpenColorIO'
167168
strategy:
169+
fail-fast: false
168170
matrix:
169171
include:
170172
# -------------------------------------------------------------------
@@ -337,6 +339,7 @@ jobs:
337339
# github.event_name != 'schedule' ||
338340
# github.repository == 'AcademySoftwareFoundation/OpenColorIO'
339341
strategy:
342+
fail-fast: false
340343
matrix:
341344
include:
342345
# -------------------------------------------------------------------

‎share/ci/scripts/multi/install_yaml-cpp.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@ if [ "$YAMLCPP_VERSION" == "latest" ]; then
2323
else
2424
if [[ "$YAMLCPP_MINOR" -lt 6 && "$YAMLCPP_PATCH" -lt 3 ]]; then
2525
git checkout tags/release-${YAMLCPP_VERSION} -b release-${YAMLCPP_VERSION}
26-
else
26+
elif [[ "$YAMLCPP_MINOR" -lt 8 ]]; then
2727
git checkout tags/yaml-cpp-${YAMLCPP_VERSION} -b yaml-cpp-${YAMLCPP_VERSION}
28+
else
29+
git checkout tags/${YAMLCPP_VERSION} -b ${YAMLCPP_VERSION}
2830
fi
2931
fi
3032

‎share/cmake/macros/GetPythonPreCommand.cmake‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ macro(get_python_pre_command)
2222
if(WIN32)
2323
# Use Windows path separators since this is being passed through to cmd
2424
file(TO_NATIVE_PATH ${PROJECT_BINARY_DIR} _WIN_BINARY_DIR)
25+
file(TO_NATIVE_PATH ${PROJECT_SOURCE_DIR} _WIN_SOURCE_DIR)
2526

2627
set(_DLL_PATH "${_WIN_BINARY_DIR}\\src\\OpenColorIO")
2728
if(MSVC_IDE)
@@ -42,8 +43,8 @@ macro(get_python_pre_command)
4243

4344
# Build path list
4445
set(_WIN_PATHS
45-
${_PYD_PATH}
46-
"${PROJECT_SOURCE_DIR}\\share\\docs"
46+
${_PYD_PATH}
47+
# "${_WIN_SOURCE_DIR}\\share\\docs"
4748
)
4849
# Include optional paths from macro arguments
4950
foreach(_PATH ${ARGN})
@@ -62,6 +63,8 @@ macro(get_python_pre_command)
6263
# '\n' is here because '\\&' does not work.
6364
set(Python_PRE_CMD set ${_PATH_SET} "\n" set ${_PYTHONPATH_SET} "\n" call)
6465

66+
message(STATUS "Python pre-command: ${Python_PRE_CMD}")
67+
6568
else()
6669
# Build path list
6770
set(_PATHS
@@ -76,6 +79,8 @@ macro(get_python_pre_command)
7679
string(JOIN ":" _PYTHONPATH_VALUE ${_PATHS})
7780
set(Python_PRE_CMD "PYTHONPATH=${_PYTHONPATH_VALUE}")
7881

82+
message(STATUS "Python pre-command: ${Python_PRE_CMD}")
83+
7984
endif()
8085

8186
endmacro()

‎share/cmake/modules/install/InstallOpenEXR.cmake‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,11 @@ if(NOT OpenEXR_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_PACK
112112
-DOPENEXR_INSTALL_EXAMPLES=OFF
113113
-DOPENEXR_BUILD_EXAMPLES=OFF
114114
-DOPENEXR_BUILD_TOOLS=OFF
115+
-DOPENEXR_FORCE_INTERNAL_DEFLATE=ON
115116
# Try to use in-source built Imath first, if available.
116117
-DCMAKE_PREFIX_PATH=${_EXT_DIST_ROOT}
117118
)
118119

119-
set(OpenEXR_CMAKE_ARGS ${OpenEXR_CMAKE_ARGS} -DOPENEXR_FORCE_INTERNAL_DEFLATE=ON)
120-
121120
if(CMAKE_TOOLCHAIN_FILE)
122121
set(OpenEXR_CMAKE_ARGS
123122
${OpenEXR_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})

0 commit comments

Comments
 (0)