fixes

Signed-off-by: Cary Phillips <[email protected]>
cary-ilm · Dec 14, 2024 · 1c31c19 · 1c31c19
1 parent 45ea7ed
commit 1c31c19
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/.github/workflows/ci_steps.yml b/.github/workflows/ci_steps.yml
@@ -33,6 +33,8 @@ on:
         type: string
       python:
         type: string
+      pybind11:
+        type: string
       IMATH_INSTALL_PKG_CONFIG:
         type: string
       BUILD_SHARED_LIBS:
@@ -76,6 +78,8 @@ jobs:
                 -DBUILD_SHARED_LIBS=${{ inputs.BUILD_SHARED_LIBS }} \
                 -DIMATH_INSTALL_PKG_CONFIG=${{ inputs.IMATH_INSTALL_PKG_CONFIG }} \
                 -DBUILD_TESTING=${{ inputs.BUILD_TESTING }} \
+                -DPYTHON=${{ inputs.python }} \
+                -DPYBIND11=${{ inputs.pybind11 }} \
                 -DCMAKE_VERBOSE_MAKEFILE=ON"
           if [ -n "${{ inputs.namespace }}" ]; then
               CMAKE_COMMAND="$CMAKE_COMMAND -DIMATH_NAMESPACE=${{ inputs.namespace }}"
@@ -124,7 +128,7 @@ jobs:
           share/ci/scripts/validate_install.py "_build/$INSTALL_MANIFEST" "share/ci/install_manifest/$INSTALL_MANIFEST"
         shell: bash
 
-      - name: Examples
+      - name: Test standalone
         run: |
           # Make sure we can build the tests when configured as a
           # standalone application linking against the just-installed
@@ -139,7 +143,11 @@ jobs:
 
           # Confirm the tests run
           ./bin/ImathTest
+        shell: bash
+        working-directory: _examples 
 
+      - name: Examples
+        run: |
           # Confirm the examples compile and execute
           rm -rf bin CMakeCache.txt CMakeFiles cmake_install.cmake Makefile
           cmake ../website/examples \
@@ -148,9 +156,11 @@ jobs:
                 -DCMAKE_CXX_STANDARD=${{ inputs.cxx-standard }}
           cmake --build . --config ${{ inputs.build-type }}
           ctest
+        shell: bash
         working-directory: _examples 
 
       - name: Test Python
+        if: ${{ inputs.python == 'ON' }}
         run: |
           # Confirm the python module loads. Set PYTHONPATH to the
           # _install directory of the module (better to find it

diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -54,6 +54,7 @@ jobs:
       cc-compiler: ${{ matrix.cc-compiler || 'gcc' }}
       build-type: ${{ matrix.build-type || 'Release' }}
       python: ${{ matrix.python || 'ON' }}
+      pybind11: ${{ matrix.pybind11 || 'ON' }}
       BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}
       IMATH_INSTALL_PKG_CONFIG: ${{ matrix.IMATH_INSTALL_PKG_CONFIG || 'ON' }}
       BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
@@ -79,6 +80,7 @@ jobs:
             IMATH_INSTALL_PKG_CONFIG: 'OFF'
             BUILD_TESTING: 'OFF'
             python: 'OFF'
+            pybind11: 'OFF'
 
           - build: 5
             label: custom namespace
@@ -105,6 +107,7 @@ jobs:
       cxx-standard: ${{ matrix.cxx-standard || '17' }}
       build-type: ${{ matrix.build-type || 'Release' }}
       python: ${{ matrix.python || 'ON' }}
+      pybind11: ${{ matrix.pybind11 || 'ON' }}
       BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}
       IMATH_INSTALL_PKG_CONFIG: ${{ matrix.IMATH_INSTALL_PKG_CONFIG || 'ON' }}
       BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
@@ -133,6 +136,7 @@ jobs:
             IMATH_INSTALL_PKG_CONFIG: 'OFF'
             BUILD_TESTING: 'OFF'
             python: 'OFF'
+            pybind11: 'OFF'
 
           - build: 6
             label: macos-13
@@ -150,6 +154,7 @@ jobs:
       cxx-standard: ${{ matrix.cxx-standard || '17' }}
       build-type: ${{ matrix.build-type || 'Release' }}
       python: ${{ matrix.python || 'ON' }}
+      pybind11: ${{ matrix.pybind11 || 'ON' }}
       BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}
       IMATH_INSTALL_PKG_CONFIG: ${{ matrix.IMATH_INSTALL_PKG_CONFIG || 'ON' }}
       BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
@@ -173,6 +178,7 @@ jobs:
             IMATH_INSTALL_PKG_CONFIG: 'OFF'
             BUILD_TESTING: 'OFF'
             python: 'OFF'
+            pybind11: 'OFF'
 
           - build: 6
             label: vfx2022