From 12ff98db76b18006c1a0f3b2eebb7800802d8de1 Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Thu, 4 Jul 2024 10:03:47 -0300 Subject: [PATCH] Fix GitHub CI as it now uses AppleSilicon HW Qt5 open source only supports x86_64 builds on macOS, this makes sure we build for the available archtecture. --- .github/workflows/cmake.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index fc244e1..7a4e7b5 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -52,7 +52,9 @@ jobs: config: - qt_version: "5.12" + macos_architectures: "x86_64" - qt_version: "6.6.0" + macos_architectures: "x86_64;arm64" steps: - name: Install Qt with options and default aqtversion @@ -70,6 +72,7 @@ jobs: uses: turtlesec-no/get-ninja@main - name: Make sure MSVC is found when Ninja generator is in use + if: ${{ runner.os == 'Windows' }} uses: ilammy/msvc-dev-cmd@v1 - name: Configure project @@ -79,6 +82,7 @@ jobs: --warn-uninitialized -Werror=dev -DBUILD_SHARED_LIBS=${{ matrix.link_type == 'shared' }} + -DCMAKE_OSX_ARCHITECTURES="${{ matrix.config.macos_architectures }}" - name: Build Project run: cmake --build ./build