Merge 438f1b8500572f7c71892f185b310677be49d0fd into 79b7e277f1f06f6b315e293b029423fe35e57431

This commit is contained in:
Seth Flynn 2025-08-01 21:19:51 +02:00 committed by GitHub
commit 89b3a579b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions

View File

@ -56,7 +56,9 @@ runs:
# TODO(@getchoo): Get this working on MSYS2!
- name: Setup ccache
if: ${{ (runner.os != 'Windows' || inputs.msystem == '') && inputs.build-type == 'Debug' }}
uses: hendrikmuhs/ccache-action@v1.2.18
# TODO(@getchoo): Un-pin when this commit makes it to a stable release!
# Needed to support the native Windows ARM runner
uses: hendrikmuhs/ccache-action@1eaec4d0426ec8b42d342bf1e7b56fd3660a8fd9
with:
variant: sccache
create-symlink: ${{ runner.os != 'Windows' }}

View File

@ -107,11 +107,10 @@ jobs:
# TODO(@getchoo): This is the default in setup-dependencies/windows. Why isn't it working?!?!
vcvars-arch: amd64
- os: windows-2022
- os: windows-11-arm
artifact-name: Windows-MSVC-arm64
base-cmake-preset: windows_msvc_arm64_cross
vcvars-arch: amd64_arm64
qt-architecture: win64_msvc2022_arm64_cross_compiled
base-cmake-preset: windows_msvc
vcvars-arch: arm64
- os: macos-14
artifact-name: macOS