From 06958886c6a10eb741c429236ef2cae6dbf0bb28 Mon Sep 17 00:00:00 2001 From: Tim Hutton Date: Sun, 9 Jun 2024 22:06:33 +0100 Subject: [PATCH] Added macos14. Tried to fix qt5 on macos. --- .github/workflows/build_macos.yml | 4 ++-- .github/workflows/build_ubuntu.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index e31c4915..88f3fb74 100644 --- 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 index 34265af5..dc356bc7 100644 --- 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