From 483be2cb8ba655f1bb767d75d0d35b10349bc3ef Mon Sep 17 00:00:00 2001 From: Kimon Hoffmann Date: Wed, 28 Aug 2024 17:32:59 +0200 Subject: [PATCH] GitHub Workflows: Update and fix macOS workflow. --- .github/workflows/ci.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f9e4e3..4d8b793 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,22 +34,22 @@ jobs: - uses: actions/checkout@v3 - name: Install Dependencies (Ubuntu) - if: startsWith(matrix.config.os, 'ubuntu') - shell: bash + if: ${{ startsWith(matrix.config.os, 'ubuntu') }} run: | sudo apt-get update sudo apt-get install -y cmake ninja-build qtbase5-dev - name: Install Dependencies (macOS) - if: startsWith(matrix.config.os, 'macos') + if: ${{ startsWith(matrix.config.os, 'macos') }} run: | brew install cmake ninja qt@5 brew link --force qt@5 sudo ln -s "$(brew --prefix qt@5)/mkspecs" /usr/local sudo ln -s "$(brew --prefix qt@5)/plugins" /usr/local + sudo ln -s "$(brew --prefix qt@5)/plugins" /usr/local - name: Install Dependencies (Windows) - if: startsWith(matrix.config.os, 'windows') + if: ${{ startsWith(matrix.config.os, 'windows') }} run: | choco install cmake ninja qt5-default @@ -57,5 +57,10 @@ jobs: run: cmake -G "${{matrix.config.generator}}" -B "${{github.workspace}}/build" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} - name: Build + if: ${{ !startsWith(matrix.config.os, 'macos') }} + run: cmake --build "${{github.workspace}}/build" --config "${{matrix.build_type}}" + + - name: Build (macOS) + if: ${{ startsWith(matrix.config.os, 'macos') }} run: cmake --build "${{github.workspace}}/build" --config "${{matrix.build_type}}"