CI: some simplifications in workflow steps

fougue · Feb 5, 2025 · eb78468 · eb78468
1 parent 783a346
commit eb78468
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/.github/workflows/ci_linux_ubuntu.yml b/.github/workflows/ci_linux_ubuntu.yml
@@ -17,8 +17,7 @@ jobs:
           uses: actions/checkout@v2
 
         - name: Update all package informations
-          run: |
-              sudo apt-get -y update
+          run: sudo apt-get -y update
 
         - name: Install Qt${{matrix.qt_version_major}}
           run: |
@@ -35,14 +34,12 @@ jobs:
               sudo apt-get -y install libxi-dev
 
         - name: Install Assimp
-          run: |
-              sudo apt-get -y install libassimp-dev
+          run: sudo apt-get -y install libassimp-dev
 
         - name: Build
           run: |
               mkdir ${{github.workspace}}/build
               cd ${{github.workspace}}/build
-              cmake --version
               cmake .. \
                     -DMayo_BuildTests=ON \
                     -DMayo_BuildPluginAssimp=ON

diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml
@@ -40,7 +40,6 @@ jobs:
           run: |
               mkdir ${{github.workspace}}/build
               cd ${{github.workspace}}/build
-              cmake --version
               cmake .. \
                     -DMayo_BuildTests=ON \
                     -DMayo_BuildPluginAssimp=ON \

diff --git a/.github/workflows/ci_macos_conda.yml b/.github/workflows/ci_macos_conda.yml
@@ -41,7 +41,6 @@ jobs:
           run: |
               mkdir ${{github.workspace}}/build
               cd ${{github.workspace}}/build
-              cmake --version
               export CMAKE_PREFIX_PATH="$CONDA/envs/ci_macos_conda/lib/cmake/Qt5;$CMAKE_PREFIX_PATH"
               export CMAKE_PREFIX_PATH="$CONDA/envs/ci_macos_conda/lib/cmake/opencascade;$CMAKE_PREFIX_PATH"
               export CMAKE_PREFIX_PATH="$CONDA/envs/ci_macos_conda/lib/cmake/assimp-5.4;$CMAKE_PREFIX_PATH"

diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
@@ -6,19 +6,9 @@ jobs:
     build-windows:
         strategy:
             matrix:
+                occ_version: [7.3.0, 7.4.0, 7.5.0, 7.6.0, 7.7.0, 7.8.0]
+                assimp_version: [5.4.3]
                 include:
-                    - occ_version: 7.3.0
-                      assimp_version: 5.4.3
-                    - occ_version: 7.4.0
-                      assimp_version: 5.4.3
-                    - occ_version: 7.5.0
-                      assimp_version: 5.4.3
-                    - occ_version: 7.6.0
-                      assimp_version: 5.4.3
-                    - occ_version: 7.7.0
-                      assimp_version: 5.4.3
-                    - occ_version: 7.8.0
-                      assimp_version: 5.4.3
                     - occ_version: 7.8.0
                       assimp_version: 5.3.1
 
@@ -105,13 +95,12 @@ jobs:
               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-${{matrix.assimp_version}}/lib/cmake/assimp-%assimp_version:~0,3%
+                    -Dassimp_DIR=${{github.workspace}}/assimp-%assimp_version%/lib/cmake/assimp-%assimp_version:~0,3%
               cmake --build . ^
                     --config Debug ^
                     --parallel ${{steps.cpu-cores.outputs.count}}