From 80824d9cb2a0cf3fb32524adb3a0bca127ab6c2f Mon Sep 17 00:00:00 2001 From: Le Tan Date: Tue, 21 May 2024 21:17:42 +0800 Subject: [PATCH] fix --- .github/workflows/ci-macos.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index d0ef158bd1..99965b653e 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -28,12 +28,12 @@ jobs: fail-fast: false matrix: config: - - name: "Build on x64" - os: macos-13 - arch: x64 + # - name: "Build on X64" + # os: macos-13 + # arch: x64 - name: "Build on Arm64" os: macos-latest - arch: arm64 + arch: universal runs-on: ${{matrix.config.os}} @@ -54,7 +54,7 @@ jobs: brew install tree libiodbc libpq - name: Fix SQL - if: ${{matrix.config.arch == 'arm64'}} + if: ${{matrix.config.arch == 'universal'}} run: | sudo mkdir -p /usr/local/opt/libiodbc/lib sudo ln -s /opt/homebrew/opt/libiodbc/lib/libiodbc.2.dylib /usr/local/opt/libiodbc/lib/libiodbc.2.dylib @@ -98,7 +98,7 @@ jobs: run: | qmake -v cmake --version - cmake -DMACDEPLOYQTFIX_EXECUTABLE=${{runner.workspace}}/macdeployqtfix/macdeployqtfix.py ${GITHUB_WORKSPACE} + cmake -DMACDEPLOYQTFIX_EXECUTABLE=${{runner.workspace}}/macdeployqtfix/macdeployqtfix.py -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" ${GITHUB_WORKSPACE} working-directory: ${{runner.workspace}}/build - name: Build Project