jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-02 03:23:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more cleanups

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

8
.ci/compile.sh
View file

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

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

@ -293,7 +293,7 @@ jobs:
- name: Install Qt ${{env.QT_VERSION}} - name: Install Qt ${{env.QT_VERSION}}
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
cache: true # qt caches take too much space for macOS (1.1Gi) cache: false # qt caches take too much space for macOS (1.1Gi)
version: ${{env.QT_VERSION}} version: ${{env.QT_VERSION}}
arch: ${{env.QT_ARCH}} arch: ${{env.QT_ARCH}}
modules: ${{env.QT_MODULES}} modules: ${{env.QT_MODULES}}
@ -318,7 +318,7 @@ jobs:
CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}' CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
VCPKG_DISABLE_METRICS: 1 VCPKG_DISABLE_METRICS: 1
VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite' VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" ${{ matrix.soc == 'Intel' && '--x86-macos' || '' }} run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" ${{ matrix.soc == 'Intel' && '--target-x86-macos' || '' }}
- name: Sign app bundle - name: Sign app bundle
if: matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null) if: matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)