jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Cross-compile intel mac and bump version from 13 to 14

Browse source
This commit is contained in:
RickyRister 2025-09-22 01:54:04 -07:00
parent 3501ee9a9d
commit bbef20fd8f
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.ci/compile.sh
View file

@ -132,6 +132,11 @@ function ccachestatsverbose() {
# Compile # Compile
if [[ $RUNNER_OS == macOS ]]; then 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" echo "::group::Signing Certificate"
if [[ -n "$MACOS_CERTIFICATE_NAME" ]]; then if [[ -n "$MACOS_CERTIFICATE_NAME" ]]; then
echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12 echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12

3
.ci/release_template.md
View file

@ -14,8 +14,7 @@ Available pre-compiled binaries for installation:
<b>macOS</b> <b>macOS</b>
• <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub> <sub>Apple M</sub> • <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub> <sub>Apple M</sub>
• <kbd>macOS 14+</kbd> <sub><i>Sonoma</i></sub> <sub>Apple M</sub> • <kbd>macOS 14+</kbd> <sub><i>Sonoma</i></sub> <sub>Apple M and Intel</sub>
• <kbd>macOS 13+</kbd> <sub><i>Ventura</i></sub> <sub>Intel</sub>
<b>Linux</b> <b>Linux</b>
• <kbd>Ubuntu 24.04 LTS</kbd> <sub><i>Noble Numbat</i></sub> • <kbd>Ubuntu 24.04 LTS</kbd> <sub><i>Noble Numbat</i></sub>

5
.github/workflows/desktop-build.yml vendored
View file

@ -230,9 +230,9 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- target: 13 - target: 14
soc: Intel soc: Intel
os: macos-13 os: macos-14
xcode: "14.3.1" xcode: "14.3.1"
type: Release type: Release
make_package: 1 make_package: 1
@ -297,6 +297,7 @@ jobs:
id: build id: build
env: env:
BUILDTYPE: '${{matrix.type}}' BUILDTYPE: '${{matrix.type}}'
ARCHTYPE: '${{matrix.soc}}'
MAKE_PACKAGE: '${{matrix.make_package}}' MAKE_PACKAGE: '${{matrix.make_package}}'
PACKAGE_SUFFIX: '-macOS${{matrix.target}}_${{matrix.soc}}' PACKAGE_SUFFIX: '-macOS${{matrix.target}}_${{matrix.soc}}'
MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }} MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}