Added macos14. Tried to fix qt5 on macos.

GollyGang · Jun 9, 2024 · 0695888 · 0695888
1 parent fa7e5d7
commit 0695888
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-12]
+        os: [macos-14, macos-13, macos-12]
         build_type: [Debug, Release]
     runs-on: ${{ matrix.os }}
 
@@ -34,7 +34,7 @@ jobs:
     - name: Install dependencies
       run: |
         brew install vtk wxmac
-        echo "MACOS_QT5_HINT=$(brew --prefix qt5)" >> $GITHUB_ENV
+        echo "MACOS_QT5_HINT=$(brew --prefix qt@5)" >> $GITHUB_ENV
 
     - name: Create Build Environment
       run: cmake -E make_directory ${{runner.workspace}}/build

diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
@@ -25,13 +25,13 @@ jobs:
     - name: git clone
       uses: actions/checkout@v4
 
-    - name: Install dependencies
+    - name: Install dependencies (24.04)
       if: matrix.os == 'ubuntu-24.04'
       run: |
         sudo apt-get update
         sudo apt-get install libvtk9-dev ocl-icd-opencl-dev libgtk-3-dev libwxgtk3.2-dev libpocl2
 
-    - name: Install dependencies
+    - name: Install dependencies (22.04, 20.04)
       if: ${{ (matrix.os == 'ubuntu-22.04') || (matrix.os == 'ubuntu-20.04') }}
       run: |
         sudo apt-get update