CI: Add draco 1.5.6 to mindeps

f3d-app · Jan 25, 2025 · 12813df · 12813df
1 parent 0db057a
commit 12813df
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 3 deletions.
diff --git a/.github/actions/draco-install-dep/action.yml b/.github/actions/draco-install-dep/action.yml
@@ -5,25 +5,33 @@ inputs:
     description: 'CPU architecture to build for'
     required: false
     default: 'x86_64'
+  version:
+    description: 'Version of draco 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 Draco
       id: cache-draco
       uses: actions/cache@v4
       with:
         path: dependencies/draco_install
-        key: draco-1.5.7-${{runner.os}}-${{inputs.cpu}}-3
+        key: draco-v${{inputs.version}}-${{runner.os}}-${{inputs.cpu}}-3
 
     - name: Checkout Draco
       if: steps.cache-draco.outputs.cache-hit != 'true'
       uses: actions/checkout@v4
       with:
         repository: google/draco
         path: './dependencies/draco'
-        ref: 1.5.7
+        ref: ${{inputs.version}}
 
     - name: Setup Draco
       if: steps.cache-draco.outputs.cache-hit != 'true'

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

diff --git a/.github/actions/generic-ci/action.yml b/.github/actions/generic-ci/action.yml
@@ -46,6 +46,9 @@ inputs:
   assimp_version:
     description: 'Version of assimp to build'
     required: true
+  draco_version:
+    description: 'Version of draco to build'
+    required: true
 
 runs:
   using: "composite"
@@ -70,6 +73,7 @@ runs:
         raytracing_label: ${{inputs.raytracing_label}}
         alembic_version: ${{inputs.alembic_version}}
         assimp_version: ${{inputs.assimp_version}}
+        draco_version: ${{inputs.draco_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
@@ -19,6 +19,9 @@ inputs:
   assimp_version:
     description: 'Version of assimp to build'
     required: true
+  draco_version:
+    description: 'Version of draco to build'
+    required: true
 
 runs:
   using: "composite"
@@ -29,6 +32,7 @@ runs:
       run: |
         [[ "${{ 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; }
 
     - name: Dependencies Dir
       shell: bash
@@ -56,3 +60,4 @@ runs:
         cpu: ${{inputs.cpu}}
         alembic_version: ${{inputs.alembic_version}}
         assimp_version: ${{inputs.assimp_version}}
+        draco_version: ${{inputs.draco_version}}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,6 +24,8 @@ jobs:
       alembic_min_version: ${{ steps.set_default_versions.outputs.alembic_min_version }}
       assimp_version: ${{ steps.set_default_versions.outputs.assimp_version }}
       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 }}
     steps:
 
     # Alembic is part of VFX reference platform (CY2025: 1.8.x)
@@ -35,6 +37,8 @@ jobs:
         echo "alembic_min_version=1.8.5" >> $GITHUB_OUTPUT
         echo "assimp_version=v5.4.3" >> $GITHUB_OUTPUT
         echo "assimp_min_version=v5.3.1" >> $GITHUB_OUTPUT
+        echo "draco_version=1.5.7" >> $GITHUB_OUTPUT
+        echo "draco_min_version=1.5.6" >> $GITHUB_OUTPUT
 
 #----------------------------------------------------------------------------
 # Cache LFS: Checkout LFS data and update the cache to limit LFS bandwidth
@@ -76,11 +80,13 @@ jobs:
             cpu: arm64
           - alembic_version: ${{needs.default_versions.outputs.alembic_version}}
           - assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+          - draco_version: ${{needs.default_versions.outputs.draco_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}}
 
     runs-on: ${{matrix.os}}
     container: ${{ matrix.os == 'ubuntu-22.04' && 'ghcr.io/f3d-app/f3d-ci' || null }}
@@ -100,6 +106,7 @@ jobs:
         cpu: ${{matrix.cpu}}
         alembic_version: ${{matrix.alembic_version}}
         assimp_version: ${{matrix.assimp_version}}
+        draco_version: ${{matrix.draco_version}}
 
 #----------------------------------------------------------------------------
 # Windows CI: Build and test, cross-vtk build matrix
@@ -136,6 +143,7 @@ jobs:
         lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+        draco_version: ${{needs.default_versions.outputs.draco_version}}
 
 #----------------------------------------------------------------------------
 # Linux CI: Build and test, cross-vtk build matrix
@@ -157,6 +165,7 @@ jobs:
           - static_label: no-static
           - alembic_version: ${{needs.default_versions.outputs.alembic_version}}
           - assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+          - draco_version: ${{needs.default_versions.outputs.draco_version}}
           - build_type: egl
             vtk_version: commit
             raytracing_label: raytracing
@@ -166,6 +175,7 @@ jobs:
             static_label: no-static
             alembic_version: ${{needs.default_versions.outputs.alembic_version}}
             assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+            draco_version: ${{needs.default_versions.outputs.draco_version}}
           - build_type: osmesa
             vtk_version: commit
             raytracing_label: raytracing
@@ -175,6 +185,7 @@ jobs:
             static_label: no-static
             alembic_version: ${{needs.default_versions.outputs.alembic_version}}
             assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+            draco_version: ${{needs.default_versions.outputs.draco_version}}
           - build_type: exclude_deprecated
             vtk_version: commit
             raytracing_label: raytracing
@@ -184,6 +195,7 @@ jobs:
             static_label: no-static
             alembic_version: ${{needs.default_versions.outputs.alembic_version}}
             assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+            draco_version: ${{needs.default_versions.outputs.draco_version}}
           - build_type: no_optional_deps
             vtk_version: commit
             raytracing_label: no-raytracing
@@ -193,6 +205,7 @@ jobs:
             static_label: no-static
             alembic_version: ${{needs.default_versions.outputs.alembic_version}}
             assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+            draco_version: ${{needs.default_versions.outputs.draco_version}}
           - build_type: static_libs
             vtk_version: commit
             raytracing_label: no-raytracing
@@ -202,6 +215,7 @@ jobs:
             static_label: static
             alembic_version: ${{needs.default_versions.outputs.alembic_version}}
             assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+            draco_version: ${{needs.default_versions.outputs.draco_version}}
           - build_type: mindeps
             vtk_version: commit
             raytracing_label: raytracing
@@ -211,6 +225,7 @@ jobs:
             static_label: no-static
             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}}
 
     runs-on: ubuntu-22.04
     container: ghcr.io/f3d-app/f3d-ci
@@ -239,6 +254,7 @@ jobs:
         lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}
         alembic_version: ${{matrix.alembic_version}}
         assimp_version: ${{matrix.assimp_version}}
+        draco_version: ${{matrix.draco_version}}
 
 #----------------------------------------------------------------------------
 # MacOS CI: Build and test, cross-vtk build matrix
@@ -270,6 +286,7 @@ jobs:
         lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+        draco_version: ${{needs.default_versions.outputs.draco_version}}
 
 #----------------------------------------------------------------------------
 # MacOS ARM CI: Build and test, cross-vtk build matrix with a few optional builds
@@ -313,6 +330,7 @@ jobs:
         lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+        draco_version: ${{needs.default_versions.outputs.draco_version}}
 
 #----------------------------------------------------------------------------
 # Python packaging: Build and test the Python wheel
@@ -360,6 +378,7 @@ jobs:
         python_version: ${{matrix.python_version}}
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+        draco_version: ${{needs.default_versions.outputs.draco_version}}
 
 #----------------------------------------------------------------------------
 # Coverage: Build and test on linux with last VTK with coverage option
@@ -392,6 +411,7 @@ jobs:
         codecov_token: ${{secrets.CODECOV_TOKEN}}
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+        draco_version: ${{needs.default_versions.outputs.draco_version}}
 
 #----------------------------------------------------------------------------
 # Sanitizer: Build and test on linux with last VTK with sanitizer options
@@ -433,6 +453,7 @@ jobs:
         lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+        draco_version: ${{needs.default_versions.outputs.draco_version}}
 
 #----------------------------------------------------------------------------
 # static-analysis: Run static analysis on linux
@@ -466,6 +487,7 @@ jobs:
         lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}
         alembic_version: ${{needs.default_versions.outputs.alembic_version}}
         assimp_version: ${{needs.default_versions.outputs.assimp_version}}
+        draco_version: ${{needs.default_versions.outputs.draco_version}}
 
 #----------------------------------------------------------------------------
 # external-build: Check build of F3D as sub-project

diff --git a/plugins/draco/CMakeLists.txt b/plugins/draco/CMakeLists.txt
@@ -11,7 +11,7 @@ else()
   include(f3dPlugin)
 endif()
 
-find_package(draco REQUIRED)
+find_package(draco 1.5.6 REQUIRED)
 
 message(STATUS "Plugin: draco ${draco_VERSION} found")