From bbef20fd8f7b4a4d14d984b5cdd09d4069707f8b Mon Sep 17 00:00:00 2001 From: RickyRister Date: Mon, 22 Sep 2025 01:54:04 -0700 Subject: [PATCH] Cross-compile intel mac and bump version from 13 to 14 --- .ci/compile.sh | 5 +++++ .ci/release_template.md | 3 +-- .github/workflows/desktop-build.yml | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.ci/compile.sh b/.ci/compile.sh index 2938e0902..2047d347f 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -132,6 +132,11 @@ function ccachestatsverbose() { # Compile if [[ $RUNNER_OS == macOS ]]; then + # enable cross-compiling for intel mac + if [[ "$ARCHTYPE" == 'Intel' ]]; then + flags+=('-DCMAKE_OSX_ARCHITECTURES="x86_64"') + fi + echo "::group::Signing Certificate" if [[ -n "$MACOS_CERTIFICATE_NAME" ]]; then echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12 diff --git a/.ci/release_template.md b/.ci/release_template.md index e5c66a29a..cd52d8ab9 100644 --- a/.ci/release_template.md +++ b/.ci/release_template.md @@ -14,8 +14,7 @@ Available pre-compiled binaries for installation: macOSmacOS 15+ Sequoia Apple M - • macOS 14+ Sonoma Apple M - • macOS 13+ Ventura Intel + • macOS 14+ Sonoma Apple M and Intel LinuxUbuntu 24.04 LTS Noble Numbat diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index db54dfbfe..5b2601959 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -230,9 +230,9 @@ jobs: fail-fast: false matrix: include: - - target: 13 + - target: 14 soc: Intel - os: macos-13 + os: macos-14 xcode: "14.3.1" type: Release make_package: 1 @@ -297,6 +297,7 @@ jobs: id: build env: BUILDTYPE: '${{matrix.type}}' + ARCHTYPE: '${{matrix.soc}}' MAKE_PACKAGE: '${{matrix.make_package}}' PACKAGE_SUFFIX: '-macOS${{matrix.target}}_${{matrix.soc}}' MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}