CI: Adding occt V7_6_3 to mindeps

f3d-app · Jan 25, 2025 · e511ae8 · e511ae8
1 parent 13145b7
commit e511ae8
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 7 deletions.
diff --git a/.github/actions/coverage-ci/action.yml b/.github/actions/coverage-ci/action.yml
@@ -17,6 +17,9 @@ inputs:
   draco_version:
     description: 'Version of draco to build'
     required: true
+  occt_version:
+    description: 'Version of occt to build'
+    required: true
 
 runs:
   using: "composite"
@@ -41,6 +44,7 @@ runs:
         alembic_version: ${{inputs.alembic_version}}
         assimp_version: ${{inputs.assimp_version}}
         draco_version: ${{inputs.draco_version}}
+        occt_version: ${{inputs.occt_version}}
 
     - name: Install VTK dependency
       uses: ./source/.github/actions/vtk-install-dep

diff --git a/.github/actions/f3d-dependencies/action.yml b/.github/actions/f3d-dependencies/action.yml
@@ -14,6 +14,9 @@ inputs:
   draco_version:
     description: 'Version of draco to build'
     required: true
+  occt_version:
+    description: 'Version of occt to build'
+    required: true
 
 runs:
   using: "composite"
@@ -29,6 +32,7 @@ runs:
       uses: ./source/.github/actions/occt-install-dep
       with:
         cpu: ${{inputs.cpu}}
+        version: ${{inputs.occt_version}}
 
     - name: Install Assimp dependency
       uses: ./source/.github/actions/assimp-install-dep

diff --git a/.github/actions/generic-ci/action.yml b/.github/actions/generic-ci/action.yml
@@ -49,6 +49,9 @@ inputs:
   draco_version:
     description: 'Version of draco to build'
     required: true
+  occt_version:
+    description: 'Version of occt to build'
+    required: true
 
 runs:
   using: "composite"
@@ -74,6 +77,7 @@ runs:
         alembic_version: ${{inputs.alembic_version}}
         assimp_version: ${{inputs.assimp_version}}
         draco_version: ${{inputs.draco_version}}
+        occt_version: ${{inputs.occt_version}}
 
     - name: Install VTK dependency
       uses: ./source/.github/actions/vtk-install-dep

diff --git a/.github/actions/generic-dependencies/action.yml b/.github/actions/generic-dependencies/action.yml
@@ -22,6 +22,9 @@ inputs:
   draco_version:
     description: 'Version of draco to build'
     required: true
+  occt_version:
+    description: 'Version of occt to build'
+    required: true
 
 runs:
   using: "composite"
@@ -33,6 +36,7 @@ runs:
         [[ "${{ inputs.alembic_version }}" ]] || { echo "alembic_version input is empty" ; exit 1; }
         [[ "${{ inputs.assimp_version }}" ]] || { echo "assimp_version input is empty" ; exit 1; }
         [[ "${{ inputs.draco_version }}" ]] || { echo "draco_version input is empty" ; exit 1; }
+        [[ "${{ inputs.occt_version }}" ]] || { echo "occt_version input is empty" ; exit 1; }
 
     - name: Dependencies Dir
       shell: bash
@@ -61,3 +65,4 @@ runs:
         alembic_version: ${{inputs.alembic_version}}
         assimp_version: ${{inputs.assimp_version}}
         draco_version: ${{inputs.draco_version}}
+        occt_version: ${{inputs.occt_version}}
diff --git a/.github/actions/occt-install-dep/action.yml b/.github/actions/occt-install-dep/action.yml
@@ -5,17 +5,25 @@ inputs:
     description: 'CPU architecture to build for'
     required: false
     default: 'x86_64'
+  version:
+    description: 'Version of occt to build'
+    required: true
 
 runs:
   using: "composite"
   steps:
 
+    - name: Check required inputs
+      shell: bash
+      run: |
+        [[ "${{ inputs.version }}" ]] || { echo "version input is empty" ; exit 1; }
+
     - name: Cache OCCT
       id: cache-occt
       uses: actions/cache@v4
       with:
         path: dependencies/occt_install
-        key: occt-V7_8_1-${{runner.os}}-${{inputs.cpu}}-3
+        key: occt-${{inputs.version}}-${{runner.os}}-${{inputs.cpu}}-3
 
     - name: Checkout OCCT
       if: steps.cache-occt.outputs.cache-hit != 'true'
@@ -24,27 +32,36 @@ runs:
         repository: Open-Cascade-SAS/OCCT
         submodules: true
         path: './dependencies/occt'
-        ref: V7_8_1
+        ref: ${{inputs.version}}
 
-    - name: Patch OCCT
+    - name: Patch OCCT all versions
       if: steps.cache-occt.outputs.cache-hit != 'true'
       working-directory: ${{github.workspace}}/dependencies/occt
       shell: bash
+      run: patch -p1 < $GITHUB_ACTION_PATH/0001-Adding-INSTALL_RPATH-Linux.patch
+
+    - name: Patch OCCT current version
+      if: |
+        steps.cache-occt.outputs.cache-hit != 'true' &&
+        inputs.version != 'V7_6_3'
+      working-directory: ${{github.workspace}}/dependencies/occt
+      shell: bash
       run: |
-        patch -p1 < $GITHUB_ACTION_PATH/0001-Adding-INSTALL_RPATH-Linux.patch
         patch -p1 < $GITHUB_ACTION_PATH/occt-remove-unneeded-includes.patch
         patch -p1 < $GITHUB_ACTION_PATH/occt-remove-unneeded-quotes-warning-msvc.patch
 
     - name: Setup OCCT
       if: steps.cache-occt.outputs.cache-hit != 'true'
       working-directory: ${{github.workspace}}/dependencies
       shell: bash
-      run: |
+      run:
         mkdir occt_build
         mkdir occt_install
 
-    - name: Configure OCCT
-      if: steps.cache-occt.outputs.cache-hit != 'true'
+    - name: Configure OCCT current version
+      if: |
+        steps.cache-occt.outputs.cache-hit != 'true' &&
+        inputs.version != 'V7_6_3'
       working-directory: ${{github.workspace}}/dependencies/occt_build
       shell: bash
       run: >
@@ -68,6 +85,33 @@ runs:
         ${{ runner.os == 'macOS' && '-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }}
         ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}
 
+    - name: Configure OCCT min version
+      if: |
+        steps.cache-occt.outputs.cache-hit != 'true' &&
+        inputs.version == 'V7_6_3'
+      working-directory: ${{github.workspace}}/dependencies/occt_build
+      shell: bash
+      run: >
+        cmake ../occt
+        -DBUILD_ADDITIONAL_TOOLKITS="TKSTEP;TKIGES;TKMesh;TKXDESTEP;TKXDEIGES"
+        -DBUILD_DOC_Overview=OFF
+        -DBUILD_LIBRARY_TYPE=Shared
+        -DBUILD_MODULE_ApplicationFramework=OFF
+        -DBUILD_MODULE_DataExchange=OFF
+        -DBUILD_MODULE_Draw=OFF
+        -DBUILD_MODULE_FoundationClasses=OFF
+        -DBUILD_MODULE_ModelingAlgorithms=OFF
+        -DBUILD_MODULE_ModelingData=OFF
+        -DBUILD_MODULE_Visualization=OFF
+        -DCMAKE_BUILD_TYPE=Release
+        -DCMAKE_INSTALL_PREFIX:PATH=../occt_install
+        -DCMAKE_INSTALL_NAME_DIR:PATH=${{github.workspace}}/dependencies/install/lib
+        -DINSTALL_DIR_BIN:PATH=bin
+        -DUSE_FREETYPE=OFF
+        -DCMAKE_OSX_ARCHITECTURES=${{ inputs.cpu }}
+        ${{ runner.os == 'macOS' && '-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
+        ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}
+
     - name: Build OCCT
       if: steps.cache-occt.outputs.cache-hit != 'true'
       working-directory: ${{github.workspace}}/dependencies/occt_build

diff --git a/.github/actions/python-ci/action.yml b/.github/actions/python-ci/action.yml
@@ -16,6 +16,9 @@ inputs:
   draco_version:
     description: 'Version of draco to build'
     required: true
+  occt_version:
+    description: 'Version of occt to build'
+    required: true
 
 runs:
   using: "composite"
@@ -39,6 +42,7 @@ runs:
         alembic_version: ${{inputs.alembic_version}}
         assimp_version: ${{inputs.assimp_version}}
         draco_version: ${{inputs.draco_version}}
+        occt_version: ${{inputs.occt_version}}
 
     - name: Install VTK dependency
       uses: ./source/.github/actions/vtk-install-dep

diff --git a/.github/actions/sanitizer-ci/action.yml b/.github/actions/sanitizer-ci/action.yml
@@ -20,6 +20,9 @@ inputs:
   draco_version:
     description: 'Version of draco to build'
     required: true
+  occt_version:
+    description: 'Version of occt to build'
+    required: true
 
 runs:
   using: "composite"
@@ -44,6 +47,7 @@ runs:
         alembic_version: ${{inputs.alembic_version}}
         assimp_version: ${{inputs.assimp_version}}
         draco_version: ${{inputs.draco_version}}
+        occt_version: ${{inputs.occt_version}}
 
     - name: Install VTK dependency
       uses: ./source/.github/actions/vtk-install-dep

diff --git a/.github/actions/static-analysis-ci/action.yml b/.github/actions/static-analysis-ci/action.yml
@@ -13,6 +13,9 @@ inputs:
   draco_version:
     description: 'Version of draco to build'
     required: true
+  occt_version:
+    description: 'Version of occt to build'
+    required: true
 
 runs:
   using: "composite"
@@ -37,6 +40,7 @@ runs:
         alembic_version: ${{inputs.alembic_version}}
         assimp_version: ${{inputs.assimp_version}}
         draco_version: ${{inputs.draco_version}}
+        occt_version: ${{inputs.occt_version}}
 
     - name: Install VTK dependency
       uses: ./source/.github/actions/vtk-install-dep

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,6 +26,8 @@ jobs:
       assimp_min_version: ${{ steps.set_default_versions.outputs.assimp_min_version }}
       draco_version: ${{ steps.set_default_versions.outputs.draco_version }}
       draco_min_version: ${{ steps.set_default_versions.outputs.draco_min_version }}
+      occt_version: ${{ steps.set_default_versions.outputs.occt_version }}
+      occt_min_version: ${{ steps.set_default_versions.outputs.occt_min_version }}
     steps:
 
     # Alembic is part of VFX reference platform (CY2025: 1.8.x)
@@ -39,6 +41,8 @@ jobs:
         echo "assimp_min_version=v5.4.0" >> $GITHUB_OUTPUT
         echo "draco_version=1.5.7" >> $GITHUB_OUTPUT
         echo "draco_min_version=1.5.6" >> $GITHUB_OUTPUT
+        echo "occt_version=V7_8_1" >> $GITHUB_OUTPUT
+        echo "occt_min_version=V7_6_3" >> $GITHUB_OUTPUT
 
 #----------------------------------------------------------------------------
 # Cache LFS: Checkout LFS data and update the cache to limit LFS bandwidth
@@ -81,12 +85,14 @@ jobs:
           - alembic_version: ${{needs.default_versions.outputs.alembic_version}}
           - assimp_version: ${{needs.default_versions.outputs.assimp_version}}
           - draco_version: ${{needs.default_versions.outputs.draco_version}}
+          - occt_version: ${{needs.default_versions.outputs.occt_version}}
           - build_type: mindeps
             os: ubuntu-22.04
             cpu: x86_64
             alembic_version: ${{needs.default_versions.outputs.alembic_min_version}}
             assimp_version: ${{needs.default_versions.outputs.assimp_min_version}}
             draco_version: ${{needs.default_versions.outputs.draco_min_version}}
+            occt_version: ${{needs.default_versions.outputs.occt_min_version}}
 
     runs-on: ${{matrix.os}}
     container: ${{ matrix.os == 'ubuntu-22.04' && 'ghcr.io/f3d-app/f3d-ci' || null }}
@@ -107,6 +113,7 @@ jobs:
         alembic_version: ${{matrix.alembic_version}}
         assimp_version: ${{matrix.assimp_version}}
         draco_version: ${{matrix.draco_version}}
+        occt_version: ${{matrix.occt_version}}
 
 #----------------------------------------------------------------------------
 # Windows CI: Build and test, cross-vtk build matrix
@@ -144,6 +151,7 @@ jobs:
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
         draco_version: ${{needs.default_versions.outputs.draco_version}}
+        occt_version: ${{needs.default_versions.outputs.occt_version}}
 
 #----------------------------------------------------------------------------
 # Linux CI: Build and test, cross-vtk build matrix
@@ -166,6 +174,7 @@ jobs:
           - alembic_version: ${{needs.default_versions.outputs.alembic_version}}
           - assimp_version: ${{needs.default_versions.outputs.assimp_version}}
           - draco_version: ${{needs.default_versions.outputs.draco_version}}
+          - occt_version: ${{needs.default_versions.outputs.occt_version}}
           - build_type: egl
             vtk_version: commit
             raytracing_label: raytracing
@@ -176,6 +185,7 @@ jobs:
             alembic_version: ${{needs.default_versions.outputs.alembic_version}}
             assimp_version: ${{needs.default_versions.outputs.assimp_version}}
             draco_version: ${{needs.default_versions.outputs.draco_version}}
+            occt_version: ${{needs.default_versions.outputs.occt_version}}
           - build_type: osmesa
             vtk_version: commit
             raytracing_label: raytracing
@@ -186,6 +196,7 @@ jobs:
             alembic_version: ${{needs.default_versions.outputs.alembic_version}}
             assimp_version: ${{needs.default_versions.outputs.assimp_version}}
             draco_version: ${{needs.default_versions.outputs.draco_version}}
+            occt_version: ${{needs.default_versions.outputs.occt_version}}
           - build_type: exclude_deprecated
             vtk_version: commit
             raytracing_label: raytracing
@@ -196,6 +207,7 @@ jobs:
             alembic_version: ${{needs.default_versions.outputs.alembic_version}}
             assimp_version: ${{needs.default_versions.outputs.assimp_version}}
             draco_version: ${{needs.default_versions.outputs.draco_version}}
+            occt_version: ${{needs.default_versions.outputs.occt_version}}
           - build_type: no_optional_deps
             vtk_version: commit
             raytracing_label: no-raytracing
@@ -206,6 +218,7 @@ jobs:
             alembic_version: ${{needs.default_versions.outputs.alembic_version}}
             assimp_version: ${{needs.default_versions.outputs.assimp_version}}
             draco_version: ${{needs.default_versions.outputs.draco_version}}
+            occt_version: ${{needs.default_versions.outputs.occt_version}}
           - build_type: static_libs
             vtk_version: commit
             raytracing_label: no-raytracing
@@ -216,6 +229,7 @@ jobs:
             alembic_version: ${{needs.default_versions.outputs.alembic_version}}
             assimp_version: ${{needs.default_versions.outputs.assimp_version}}
             draco_version: ${{needs.default_versions.outputs.draco_version}}
+            occt_version: ${{needs.default_versions.outputs.occt_version}}
           - build_type: mindeps
             vtk_version: commit
             raytracing_label: raytracing
@@ -226,6 +240,7 @@ jobs:
             alembic_version: ${{needs.default_versions.outputs.alembic_min_version}}
             assimp_version: ${{needs.default_versions.outputs.assimp_min_version}}
             draco_version: ${{needs.default_versions.outputs.draco_min_version}}
+            occt_version: ${{needs.default_versions.outputs.occt_min_version}}
 
     runs-on: ubuntu-22.04
     container: ghcr.io/f3d-app/f3d-ci
@@ -255,6 +270,7 @@ jobs:
         alembic_version: ${{matrix.alembic_version}}
         assimp_version: ${{matrix.assimp_version}}
         draco_version: ${{matrix.draco_version}}
+        occt_version: ${{matrix.occt_version}}
 
 #----------------------------------------------------------------------------
 # MacOS CI: Build and test, cross-vtk build matrix
@@ -287,6 +303,7 @@ jobs:
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
         draco_version: ${{needs.default_versions.outputs.draco_version}}
+        occt_version: ${{needs.default_versions.outputs.occt_version}}
 
 #----------------------------------------------------------------------------
 # MacOS ARM CI: Build and test, cross-vtk build matrix with a few optional builds
@@ -331,6 +348,7 @@ jobs:
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
         draco_version: ${{needs.default_versions.outputs.draco_version}}
+        occt_version: ${{needs.default_versions.outputs.occt_version}}
 
 #----------------------------------------------------------------------------
 # Python packaging: Build and test the Python wheel
@@ -379,6 +397,7 @@ jobs:
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
         draco_version: ${{needs.default_versions.outputs.draco_version}}
+        occt_version: ${{needs.default_versions.outputs.occt_version}}
 
 #----------------------------------------------------------------------------
 # Coverage: Build and test on linux with last VTK with coverage option
@@ -412,6 +431,7 @@ jobs:
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
         draco_version: ${{needs.default_versions.outputs.draco_version}}
+        occt_version: ${{needs.default_versions.outputs.occt_version}}
 
 #----------------------------------------------------------------------------
 # Sanitizer: Build and test on linux with last VTK with sanitizer options
@@ -454,6 +474,7 @@ jobs:
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
         draco_version: ${{needs.default_versions.outputs.draco_version}}
+        occt_version: ${{needs.default_versions.outputs.occt_version}}
 
 #----------------------------------------------------------------------------
 # static-analysis: Run static analysis on linux
@@ -488,6 +509,7 @@ jobs:
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
         draco_version: ${{needs.default_versions.outputs.draco_version}}
+        occt_version: ${{needs.default_versions.outputs.occt_version}}
 
 #----------------------------------------------------------------------------
 # external-build: Check build of F3D as sub-project