Merge branch 'ci/simplify' into develop

fougue · Feb 12, 2025 · c69d48b · c69d48b
2 parents 45d9953 + 1504c89
commit c69d48b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 22 deletions.
diff --git a/.github/CI_OVERVIEW.md b/.github/CI_OVERVIEW.md
@@ -0,0 +1,7 @@
+
+   OS    |  Status
+---------|---------------------------------------------------
+ Linux   | [![Linux Arch x64](https://github.com/fougue/mayo/actions/workflows/ci_linux_arch.yml/badge.svg)](https://github.com/fougue/mayo/actions/workflows/ci_linux_arch.yml)<br>[![Linux Fedora x64](https://github.com/fougue/mayo/actions/workflows/ci_linux_fedora.yml/badge.svg)](https://github.com/fougue/mayo/actions/workflows/ci_linux_fedora.yml)<br>[![Linux Ubuntu armv7](https://github.com/fougue/mayo/actions/workflows/ci_linux_ubuntu_armv7.yml/badge.svg)](https://github.com/fougue/mayo/actions/workflows/ci_linux_ubuntu_armv7.yml)<br>[![Linux Ubuntu x64/arm64](https://github.com/fougue/mayo/actions/workflows/ci_linux_ubuntu.yml/badge.svg)](https://github.com/fougue/mayo/actions/workflows/ci_linux_ubuntu.yml)	 
+ macOS   | [![macOS arm64](https://github.com/fougue/mayo/actions/workflows/ci_macos.yml/badge.svg)](https://github.com/fougue/mayo/actions/workflows/ci_macos.yml)<br>[![macOS-conda arm64](https://github.com/fougue/mayo/actions/workflows/ci_macos_conda.yml/badge.svg)](https://github.com/fougue/mayo/actions/workflows/ci_macos_conda.yml)
+ Windows | [![Windows x64](https://github.com/fougue/mayo/actions/workflows/ci_windows.yml/badge.svg)](https://github.com/fougue/mayo/actions/workflows/ci_windows.yml)
+
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
 
@@ -104,14 +94,14 @@ jobs:
           run: |
               mkdir ${{github.workspace}}\build
               cd ${{github.workspace}}\build
+              set occ_version=${{matrix.occ_version}}
               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%
+                    -DOpenCASCADE_DIR=${{github.workspace}}/OpenCASCADE-%occ_version%-vc14-64/opencascade-%occ_version% ^
+                    -Dassimp_DIR=${{github.workspace}}/assimp-%assimp_version%/lib/cmake/assimp-%assimp_version:~0,3%
               cmake --build . ^
                     --config Debug ^
                     --parallel ${{steps.cpu-cores.outputs.count}}

diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 [![Windows CI](https://github.com/fougue/mayo/actions/workflows/ci_windows.yml/badge.svg?branch=develop)](https://github.com/fougue/mayo/actions/workflows/ci_windows.yml)
 [![Linux CI](https://github.com/fougue/mayo/actions/workflows/ci_linux_ubuntu.yml/badge.svg?branch=develop)](https://github.com/fougue/mayo/actions/workflows/ci_linux_ubuntu.yml)
 [![macOS CI](https://github.com/fougue/mayo/actions/workflows/ci_macos.yml/badge.svg?branch=develop)](https://github.com/fougue/mayo/actions/workflows/ci_macos.yml)
+<br>
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/d51f8ca6fea34886b8308ff0246172ce)](https://app.codacy.com/gh/fougue/mayo/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![Downloads](https://img.shields.io/github/downloads/fougue/mayo/total.svg)](https://github.com/fougue/mayo/releases)
 [![Version](https://img.shields.io/badge/version-v0.9.0-blue.svg?style=flat)](https://github.com/fougue/mayo/releases)