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

Merge 3ce168f38c into f3b41432cb

Browse source
This commit is contained in:
tooomm 2026-07-06 08:55:48 +02:00 • committed by GitHub
commit b17e31cf3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 34 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -263,7 +263,7 @@ jobs:
include: include:
- os: macOS - os: macOS
target: 13 target: 13
runner: macos-15-intel runner: macos-26-intel
ccache_eviction_age: 7d ccache_eviction_age: 7d
cmake_generator: Ninja cmake_generator: Ninja
@ -276,15 +276,34 @@ jobs:
soc: Intel soc: Intel
type: Release type: Release
use_ccache: 1 use_ccache: 1
xcode: "16.4" xcode: "26.6"
- os: macOS - os: macOS
target: 14 target: 13
runner: macos-14 runner: macos-26
ccache_eviction_age: 7d ccache_eviction_age: 7d
cmake_generator: Ninja cmake_generator: Ninja
make_package: 1 make_package: 1
override_target: 13
override_arch: x86_64
package_suffix: "-macOS13_Intel2"
qt_version: 6.11.0
qt_arch: clang_64
qt_modules: qtimageformats qtmultimedia qtwebsockets
soc: Intel
type: Release
use_ccache: 1
xcode: "26.6"
- os: macOS
target: 14
runner: macos-26
ccache_eviction_age: 7d
cmake_generator: Ninja
make_package: 1
override_target: 14
package_suffix: "-macOS14" package_suffix: "-macOS14"
qt_version: 6.11.0 qt_version: 6.11.0
qt_arch: clang_64 qt_arch: clang_64
@ -292,15 +311,16 @@ jobs:
soc: Apple soc: Apple
type: Release type: Release
use_ccache: 1 use_ccache: 1
xcode: "15.4" xcode: "26.6"
- os: macOS - os: macOS
target: 15 target: 15
runner: macos-15 runner: macos-26
ccache_eviction_age: 7d ccache_eviction_age: 7d
cmake_generator: Ninja cmake_generator: Ninja
make_package: 1 make_package: 1
override_target: 15
package_suffix: "-macOS15" package_suffix: "-macOS15"
qt_version: 6.11.0 qt_version: 6.11.0
qt_arch: clang_64 qt_arch: clang_64
@ -308,21 +328,23 @@ jobs:
soc: Apple soc: Apple
type: Release type: Release
use_ccache: 1 use_ccache: 1
xcode: "16.4" xcode: "26.6"
- os: macOS - os: macOS
target: 15 target: 26
runner: macos-15 runner: macos-26
ccache_eviction_age: 7d ccache_eviction_age: 7d
cmake_generator: Ninja cmake_generator: Ninja
make_package: 1
package_suffix: "-macOS26"
qt_version: 6.11.0 qt_version: 6.11.0
qt_arch: clang_64 qt_arch: clang_64
qt_modules: qtimageformats qtmultimedia qtwebsockets qt_modules: qtimageformats qtmultimedia qtwebsockets
soc: Apple soc: Apple
type: Debug type: Release
use_ccache: 1 use_ccache: 1
xcode: "16.4" xcode: "26.6"
- os: Windows - os: Windows
target: 10 target: 10
@ -454,6 +476,7 @@ jobs:
MAKE_PACKAGE: '${{ matrix.make_package }}' MAKE_PACKAGE: '${{ matrix.make_package }}'
PACKAGE_SUFFIX: '${{ matrix.package_suffix }}' PACKAGE_SUFFIX: '${{ matrix.package_suffix }}'
TARGET_MACOS_VERSION: ${{ matrix.override_target }} TARGET_MACOS_VERSION: ${{ matrix.override_target }}
CMAKE_OSX_ARCHITECTURES: ${{ matrix.override_arch }}
USE_CCACHE: ${{ matrix.use_ccache }} USE_CCACHE: ${{ matrix.use_ccache }}
VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite' VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
VCPKG_DISABLE_METRICS: 1 VCPKG_DISABLE_METRICS: 1