From 6ebb6aaee15a138741f16d03d0724bdd9831fdf3 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 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f9e4e3..e70d634 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,14 +34,13 @@ 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 @@ -49,13 +48,18 @@ jobs: 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 - name: Configure + if: ${{ !startsWith(matrix.config.os, 'macos') }} run: cmake -G "${{matrix.config.generator}}" -B "${{github.workspace}}/build" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} + - name: Configure (macOS) + if: ${{ startsWith(matrix.config.os, 'macos') }} + run: PATH=/opt/homebrew/bin:${{'${PATH}'}} cmake -G "${{matrix.config.generator}}" -B "${{github.workspace}}/build" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} + - name: Build run: cmake --build "${{github.workspace}}/build" --config "${{matrix.build_type}}"