jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-21 00:55:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge 83c32913db into 7a2492ac67

Browse source
This commit is contained in:
tooomm 2026-09-21 00:43:21 -07:00 • committed by GitHub
commit 89e7eee656
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -277,11 +277,10 @@ jobs:
soc: Intel
type: Release
use_ccache: 1
xcode: "26.3"
- os: macOS
target: 14 # EOL 2026-??
runner: macos-26 # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
target: 14 # EOL 2026-09-14
runner: xcode-27 # https://github.com/actions/runner-images/blob/main/images/macos/xcode-27-arm64-Readme.md
ccache_eviction_age: 7d
cmake_generator: Ninja
@ -293,11 +292,10 @@ jobs:
soc: Apple
type: Release
use_ccache: 1
xcode: "26.6"
- os: macOS
target: 15
runner: macos-26 # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
target: 15 # 2027-??
runner: xcode-27 # https://github.com/actions/runner-images/blob/main/images/macos/xcode-27-arm64-Readme.md
ccache_eviction_age: 7d
cmake_generator: Ninja
@ -309,11 +307,10 @@ jobs:
soc: Apple
type: Release
use_ccache: 1
xcode: "26.6"
- os: macOS
target: 26
runner: macos-26 # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
target: 27
runner: xcode-27 # https://github.com/actions/runner-images/blob/main/images/macos/xcode-27-arm64-Readme.md
ccache_eviction_age: 7d
cmake_generator: Ninja
@ -322,7 +319,6 @@ jobs:
soc: Apple
type: Debug
use_ccache: 1
xcode: "26.6"
- os: Windows
target: 10
@ -365,7 +361,7 @@ jobs:
id: restore_ccache
uses: actions/cache/restore@v6
with:
key: ccache-${{ matrix.runner }}_${{ matrix.override_target }}-Xcode${{ matrix.xcode }}
key: ccache-${{ matrix.os }}${{ matrix.override_target }}-${{ matrix.runner }}
path: ${{ env.CCACHE_DIR }}
- name: "[macOS] Install aqtinstall"
@ -443,7 +439,6 @@ jobs:
CCACHE_EVICTION_AGE: ${{ matrix.ccache_eviction_age }}
CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
CMAKE_GENERATOR_PLATFORM: ${{ matrix.cmake_generator_platform }}
DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer'
GITHUB_TOKEN: ${{ github.token }} # needed for vcpkg dependency graph updates, see VCPKG_FEATURE_FLAGS
MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}