Skip to content

Commit

Permalink
split
Browse files Browse the repository at this point in the history
  • Loading branch information
tamlok committed May 28, 2024
1 parent 979f765 commit e325067
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@ jobs:
fail-fast: false
matrix:
config:
- name: "Build on Arm64"
- name: "Build for Arm64"
os: macos-latest
arch: universal
arch: arm64
- name: "Build for X64"
os: macos-latest
arch: x86_64

runs-on: ${{matrix.config.os}}

Expand All @@ -51,7 +54,7 @@ jobs:
brew install tree libiodbc libpq
- name: Fix SQL
if: ${{matrix.config.arch == 'universal'}}
# 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
Expand Down Expand Up @@ -95,7 +98,7 @@ jobs:
run: |
qmake -v
cmake --version
cmake -DMACDEPLOYQTFIX_EXECUTABLE=${{runner.workspace}}/macdeployqtfix/macdeployqtfix.py -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" ${GITHUB_WORKSPACE}
cmake -DMACDEPLOYQTFIX_EXECUTABLE=${{runner.workspace}}/macdeployqtfix/macdeployqtfix.py -DCMAKE_OSX_ARCHITECTURES=${{matrix.config.arch}} ${GITHUB_WORKSPACE}
working-directory: ${{runner.workspace}}/build

- name: Build Project
Expand Down

0 comments on commit e325067

Please sign in to comment.