GitHub Workflows: Update and fix macOS workflow.

Lawo · Aug 28, 2024 · 6ebb6aa · 6ebb6aa
1 parent 83a4444
commit 6ebb6aa
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,28 +34,32 @@ 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
 
       - 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}}"