From 97fc2433fbcfe400d0481bba5903903f5e00cb6d Mon Sep 17 00:00:00 2001 From: Florian Becker Date: Fri, 15 Nov 2024 15:03:18 +0100 Subject: [PATCH] Try to handle all native on m build --- .github/workflows/macos.yml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d3fcca4..8f0320d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -19,8 +19,8 @@ jobs: # macos-13-xcode-14-arm64, macos-13-xcode-15-x86_64, # macos-13-xcode-15-arm64, - macos-14-xcode-16-x86_64 -# macos-14-xcode-16-arm64 +# macos-14-xcode-16-x86_64 + macos-14-xcode-16-arm64 ] config: [Debug, Release] include: @@ -48,17 +48,17 @@ jobs: # version: "15.2" # architecture: arm64 - - name: macos-14-xcode-16-x86_64 - os: macos-14 - compiler: xcode - version: "15.4" - architecture: x86_64 - -# - name: macos-14-xcode-16-arm64 +# - name: macos-14-xcode-16-x86_64 # os: macos-14 # compiler: xcode # version: "15.4" -# architecture: arm64 +# architecture: x86_64 + + - name: macos-14-xcode-16-arm64 + os: macos-14 + compiler: xcode + version: "15.4" + architecture: arm64 steps: - uses: actions/checkout@v4 @@ -67,8 +67,8 @@ jobs: run: | brew install ninja brew install doxygen graphviz - arch -${{matrix.architecture}} brew install icu4c - arch -${{matrix.architecture}} brew install sqlite + brew install icu4c + brew install sqlite if [ "${{matrix.compiler}}" = "xcode" ]; then ls -ls /Applications/ @@ -77,8 +77,6 @@ jobs: echo "CXX=clang++" >> $GITHUB_ENV fi - brew --prefix sqlite - - name: Create Build Environment run: cmake -E make_directory ${{runner.workspace}}/build