From ac345b30f2cdfbb9989c2c61ccf407da5ed9155a Mon Sep 17 00:00:00 2001 From: Frostbyte <71291438+frostbyte0x70@users.noreply.github.com> Date: Fri, 12 Dec 2025 01:45:14 +0100 Subject: [PATCH 1/3] Fix mac build --- .github/workflows/build-test-publish.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index 802aefc..8b88c57 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -22,7 +22,7 @@ jobs: arch: x86_64 - os: ubuntu-latest arch: aarch64 - - os: macos-13 + - os: macos-14 arch: x86_64 - os: macos-14 arch: arm64 @@ -69,12 +69,12 @@ jobs: shell: bash run: | echo CIBW_ENVIRONMENT_WINDOWS="FASTBUILD=1 BUILD_32=1" >> $GITHUB_ENV - - name: "MacOS 13: Set deployment target" - if: matrix.os == 'macos-13' + - name: "MacOS 14 x64: Set deployment target" + if: matrix.os == 'macos-14' && matrix.arch == 'x86_64' run: | - echo "MACOSX_DEPLOYMENT_TARGET=13.0" >> $GITHUB_ENV - - name: "MacOS 14: Set deployment target & fix arch flags" - if: matrix.os == 'macos-14' + echo "MACOSX_DEPLOYMENT_TARGET=14.0" >> $GITHUB_ENV + - name: "MacOS 14 arm: Set deployment target & fix arch flags" + if: matrix.os == 'macos-14' && matrix.arch == 'arm64' run: | echo "MACOSX_DEPLOYMENT_TARGET=14.0" >> $GITHUB_ENV # This really shouldn't be needed though?? From 5c447195451a8e1ef345e163f0235b0addc6bba3 Mon Sep 17 00:00:00 2001 From: Frostbyte <71291438+frostbyte0x70@users.noreply.github.com> Date: Fri, 12 Dec 2025 01:58:57 +0100 Subject: [PATCH 2/3] Try explicitly setting x64 flags --- .github/workflows/build-test-publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index 8b88c57..df89c30 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -69,15 +69,15 @@ jobs: shell: bash run: | echo CIBW_ENVIRONMENT_WINDOWS="FASTBUILD=1 BUILD_32=1" >> $GITHUB_ENV - - name: "MacOS 14 x64: Set deployment target" + - name: "MacOS 14 x64: Set deployment target & fix arch flags" if: matrix.os == 'macos-14' && matrix.arch == 'x86_64' run: | echo "MACOSX_DEPLOYMENT_TARGET=14.0" >> $GITHUB_ENV + echo "CPPFLAGS=-arch x86_64" >> $GITHUB_ENV - name: "MacOS 14 arm: Set deployment target & fix arch flags" if: matrix.os == 'macos-14' && matrix.arch == 'arm64' run: | echo "MACOSX_DEPLOYMENT_TARGET=14.0" >> $GITHUB_ENV - # This really shouldn't be needed though?? echo "CPPFLAGS=-arch arm64" >> $GITHUB_ENV - name: Add msbuild to PATH if: runner.os == 'Windows' From 02d881dc1cc81e4eee84702f2f95d6f7bd8af22c Mon Sep 17 00:00:00 2001 From: Frostbyte <71291438+frostbyte0x70@users.noreply.github.com> Date: Fri, 12 Dec 2025 02:10:47 +0100 Subject: [PATCH 3/3] Switch to MacOS 15 Intel runner --- .github/workflows/build-test-publish.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index df89c30..4be1a7e 100644 --- a/.github/workflows/build-test-publish.yml +++ b/.github/workflows/build-test-publish.yml @@ -22,7 +22,7 @@ jobs: arch: x86_64 - os: ubuntu-latest arch: aarch64 - - os: macos-14 + - os: macos-15-intel arch: x86_64 - os: macos-14 arch: arm64 @@ -69,15 +69,15 @@ jobs: shell: bash run: | echo CIBW_ENVIRONMENT_WINDOWS="FASTBUILD=1 BUILD_32=1" >> $GITHUB_ENV - - name: "MacOS 14 x64: Set deployment target & fix arch flags" - if: matrix.os == 'macos-14' && matrix.arch == 'x86_64' + - name: "MacOS 15 x64: Set deployment target" + if: matrix.os == 'macos-15-intel' && matrix.arch == 'x86_64' run: | - echo "MACOSX_DEPLOYMENT_TARGET=14.0" >> $GITHUB_ENV - echo "CPPFLAGS=-arch x86_64" >> $GITHUB_ENV + echo "MACOSX_DEPLOYMENT_TARGET=15.0" >> $GITHUB_ENV - name: "MacOS 14 arm: Set deployment target & fix arch flags" if: matrix.os == 'macos-14' && matrix.arch == 'arm64' run: | echo "MACOSX_DEPLOYMENT_TARGET=14.0" >> $GITHUB_ENV + # This really shouldn't be needed though?? echo "CPPFLAGS=-arch arm64" >> $GITHUB_ENV - name: Add msbuild to PATH if: runner.os == 'Windows'