Merge branch 'ci/assimp-versions' into develop

fougue · Dec 27, 2024 · 2106aba · 2106aba
2 parents 99e05c8 + 5c2f034
commit 2106aba
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 15 deletions.
diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml
@@ -30,7 +30,7 @@ jobs:
         - name: Install OpenCascade
           run: |
               sudo apt-get -y install libocct-data-exchange-dev libocct-draw-dev occt-misc
-              sudo apt-get -y install libtbb2-dev
+              sudo apt-get -y install libtbb-dev
               sudo apt-get -y install libxi-dev
 
         - name: Install Assimp

diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
@@ -8,22 +8,47 @@ jobs:
             matrix:
                 include:
                     - occ_version: 7.3.0
-                      occ_zip_sha256: '2503e69d595bb4c4e760b629aba3d8cee5e6b8d0da43b0d790a7949c67fd15d0'
+                      assimp_version: 5.4.3
                     - occ_version: 7.4.0
-                      occ_zip_sha256: '6664b9a4213036ff0960edd2426258cf66844386c1a2338fa62e008f40c476bb'
+                      assimp_version: 5.4.3
                     - occ_version: 7.5.0
-                      occ_zip_sha256: '8000f261ecbf6689e48439aa5895304069d00a14efe28eb7f1d108450cb7a74f'
+                      assimp_version: 5.4.3
                     - occ_version: 7.6.0
-                      occ_zip_sha256: '137788c7693f74fb98797adfd06c1b00f66dac59beca5c3073c1f62c98b7a80f'
+                      assimp_version: 5.4.3
                     - occ_version: 7.7.0
-                      occ_zip_sha256: '82afb7bd5fd7097189ee4e98bf3bc02b4030cae7a82967db68d5f2b556801779'
+                      assimp_version: 5.4.3
                     - occ_version: 7.8.0
-                      occ_zip_sha256: 'beb30920efe5e5384d500d43dcb8ba1f476a76bb65b268b1af32d807b697bdee'
+                      assimp_version: 5.4.3
+                    - occ_version: 7.8.0
+                      assimp_version: 5.3.1
 
         runs-on: windows-latest
-        name: build-win-msvc-occt${{matrix.occ_version}}
+        name: build-win-msvc-occt${{matrix.occ_version}}-assimp${{matrix.assimp_version}}
 
         steps:
+        - name: Set globals
+          id: globals
+          shell: cmd
+          run: |
+              if "%occ_version%"=="7.3.0" (
+                  echo "occ_zip_sha256=2503e69d595bb4c4e760b629aba3d8cee5e6b8d0da43b0d790a7949c67fd15d0" >> "${GITHUB_OUTPUT}"
+              ) else if "%occ_version%"=="7.4.0" (
+                  echo "occ_zip_sha256=6664b9a4213036ff0960edd2426258cf66844386c1a2338fa62e008f40c476bb" >> "${GITHUB_OUTPUT}"
+              ) else if "%occ_version%"=="7.5.0" (
+                  echo "occ_zip_sha256=8000f261ecbf6689e48439aa5895304069d00a14efe28eb7f1d108450cb7a74f" >> "${GITHUB_OUTPUT}"
+              ) else if "%occ_version%"=="7.6.0" (
+                  echo "occ_zip_sha256=137788c7693f74fb98797adfd06c1b00f66dac59beca5c3073c1f62c98b7a80f" >> "${GITHUB_OUTPUT}"
+              ) else if "%occ_version%"=="7.7.0" (
+                  echo "occ_zip_sha256=82afb7bd5fd7097189ee4e98bf3bc02b4030cae7a82967db68d5f2b556801779" >> "${GITHUB_OUTPUT}"
+              ) else if "%occ_version%"=="7.8.0" (
+                  echo "occ_zip_sha256=beb30920efe5e5384d500d43dcb8ba1f476a76bb65b268b1af32d807b697bdee" >> "${GITHUB_OUTPUT}"
+              )
+              if "%assimp_version%"=="5.3.1" (
+                  echo "assimp_zip_sha256=b6097488fa5b7a0cc610e8258e74aaa9552b48a13bc8680eedd66512d788e64f" >> "${GITHUB_OUTPUT}"
+              ) else if "%assimp_version%"=="5.4.3" (
+                  echo "assimp_zip_sha256=b321031eba023d8874ed794aa9aad5b6b132b2e4b8835ecc99ba428be48d0305" >> "${GITHUB_OUTPUT}"
+              )
+
         - name: Checkout
           uses: actions/checkout@v3
 
@@ -45,7 +70,7 @@ jobs:
           uses: carlosperate/download-file-action@v2
           with:
               file-url: 'https://www.fougue.pro/share/bin/OpenCASCADE-${{matrix.occ_version}}-vc14-64.zip'
-              sha256: ${{matrix.occ_zip_sha256}}
+              sha256: ${{steps.globals.outputs.occ_zip_sha256}}
 
         - name: Extract OpenCascade
           run: 7z x OpenCASCADE-${{matrix.occ_version}}-vc14-64.zip
@@ -54,18 +79,18 @@ jobs:
           id: cache-assimp
           uses: actions/cache@v3
           with:
-              path: assimp-5.3.1.zip
-              key: assimp-5.3.1
+              path: assimp-${{matrix.assimp_version}}.zip
+              key: assimp-${{matrix.assimp_version}}
 
         - name: Download Assimp
           if: steps.cache-assimp.outputs.cache-hit != 'true'
           uses: carlosperate/download-file-action@v2
           with:
-              file-url: 'https://www.fougue.pro/share/bin/assimp-5.3.1.zip'
-              sha256: 'b6097488fa5b7a0cc610e8258e74aaa9552b48a13bc8680eedd66512d788e64f'
+              file-url: 'https://www.fougue.pro/share/bin/assimp-${{matrix.assimp_version}}.zip'
+              sha256: ${{steps.globals.outputs.assimp_zip_sha256}}
 
         - name: Extract Assimp
-          run: 7z x assimp-5.3.1.zip
+          run: 7z x assimp-${{matrix.assimp_version}}.zip
 
         - name: Get count of CPU cores
           uses: SimenB/github-actions-cpu-cores@v1
@@ -79,13 +104,14 @@ jobs:
           run: |
               mkdir ${{github.workspace}}\build
               cd ${{github.workspace}}\build
+              set assimp_version=${{matrix.assimp_version}}
               cmake --version
               cmake .. ^
                     -DMayo_BuildTests=ON ^
                     -DMayo_BuildPluginAssimp=ON ^
                     -DMayo_PostBuildCopyRuntimeDLLs=ON ^
                     -DOpenCASCADE_DIR=../OpenCASCADE-${{matrix.occ_version}}-vc14-64/opencascade-${{matrix.occ_version}} ^
-                    -Dassimp_DIR=${{github.workspace}}/assimp-5.3.1/lib/cmake/assimp-5.3
+                    -Dassimp_DIR=${{github.workspace}}/assimp-${{matrix.assimp_version}}/lib/cmake/assimp-%assimp_version:~0,3%
               cmake --build . ^
                     --config Debug ^
                     --parallel ${{steps.cpu-cores.outputs.count}}