diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml index 5baf36e0..ba313b93 100644 --- a/.github/workflows/ci_macos.yml +++ b/.github/workflows/ci_macos.yml @@ -1,4 +1,4 @@ -name: macOS +name: macOS-brew on: [push] diff --git a/.github/workflows/ci_macos_conda.yml b/.github/workflows/ci_macos_conda.yml new file mode 100644 index 00000000..fa746cdd --- /dev/null +++ b/.github/workflows/ci_macos_conda.yml @@ -0,0 +1,48 @@ +name: macOS-conda + +on: [push] + +jobs: + build-macos: + runs-on: macos-latest + name: build-macos-qt${{matrix.qt_version_name}} + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Set Conda Environment + uses: conda-incubator/setup-miniconda@v3 + with: + miniconda-version: "latest" + activate-environment: ci_macos_conda + + - name: Install Qt5 + run: conda install conda-forge::qt + + - name: Install OpenCascade + run: conda install conda-forge::occt + + - name: Install Assimp + run: conda install conda-forge::assimp + + - name: Get count of CPU cores + uses: SimenB/github-actions-cpu-cores@v1 + id: cpu-cores + + - name: Build + run: | + mkdir ${{github.workspace}}/build + cd ${{github.workspace}}/build + cmake --version + cmake .. \ + -DMayo_BuildTests=ON \ + -DMayo_BuildPluginAssimp=ON + cmake --build . \ + --config Release \ + --parallel ${{steps.cpu-cores.outputs.count}} + + - name: Execute Unit Tests + working-directory: ${{github.workspace}}/build + run: | + ./mayo.app/Contents/MacOS/mayo --runtests diff --git a/CMakeLists.txt b/CMakeLists.txt index c2603e87..cda8ad49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -683,6 +683,7 @@ add_custom_target( .github/workflows/ci_linux.yml .github/workflows/ci_linux_arm.yml .github/workflows/ci_macos.yml + .github/workflows/ci_macos_conda.yml .github/workflows/ci_windows.yml images/credits.txt scripts/bump-version.rb