jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

adress initial reviews

Browse source
This commit is contained in:
Bruno Alexandre Rosa 2025-10-03 18:28:21 -03:00
parent 3839ce9d15
commit f7b7c62376
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.ci/compile.sh
View file

@ -11,7 +11,7 @@
# --debug or --release sets the build type ie CMAKE_BUILD_TYPE
# --ccache [<size>] uses ccache and shows stats, optionally provide size
# --dir <dir> sets the name of the build dir, default is "build"
# --target-x86-macos sets the min os version to 13.0 - only used for Intel builds
# --target-macos-version <version> sets the min os version - only used for macOS
# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_TEST USE_CCACHE CCACHE_SIZE BUILD_DIR CMAKE_GENERATOR
# (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --ccache <ccache_size> --dir <dir>)
# exitcode: 1 for failure, 3 for invalid arguments
@ -76,9 +76,13 @@ while [[ $# != 0 ]]; do
BUILD_DIR="$1"
shift
;;
'--target-x86-macos')
'--target-macos-version')
shift
TARGET_X86_MACOS=1
if [[ $# == 0 ]]; then
echo "::error file=$0::--target-macos-version expects an argument"
exit 3
fi
TARGET_MACOS_VERSION="$1"
shift
;;
*)
@ -122,8 +126,8 @@ fi
if [[ $PACKAGE_TYPE ]]; then
flags+=("-DCPACK_GENERATOR=$PACKAGE_TYPE")
fi
if [[ $TARGET_X86_MACOS ]]; then
flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=13.0")
if [[ $TARGET_MACOS_VERSION ]]; then
flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=$TARGET_MACOS_VERSION")
flags+=("-DVCPKG_TARGET_TRIPLET=x64-osx-13")
flags+=("-DVCPKG_OVERLAY_TRIPLETS=../cmake/triplets")
fi

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

@ -318,7 +318,7 @@ jobs:
CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
VCPKG_DISABLE_METRICS: 1
VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" ${{ matrix.soc == 'Intel' && '--target-x86-macos' || '' }}
run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" ${{ matrix.soc == 'Intel' && '--target-macos-version 13.0' || '' }}
- name: Sign app bundle
if: matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)