mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2025-08-03 19:37:45 -04:00
Merge 438f1b8500572f7c71892f185b310677be49d0fd into 79b7e277f1f06f6b315e293b029423fe35e57431
This commit is contained in:
commit
89b3a579b3
@ -56,7 +56,9 @@ runs:
|
|||||||
# TODO(@getchoo): Get this working on MSYS2!
|
# TODO(@getchoo): Get this working on MSYS2!
|
||||||
- name: Setup ccache
|
- name: Setup ccache
|
||||||
if: ${{ (runner.os != 'Windows' || inputs.msystem == '') && inputs.build-type == 'Debug' }}
|
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:
|
with:
|
||||||
variant: sccache
|
variant: sccache
|
||||||
create-symlink: ${{ runner.os != 'Windows' }}
|
create-symlink: ${{ runner.os != 'Windows' }}
|
||||||
|
7
.github/workflows/build.yml
vendored
7
.github/workflows/build.yml
vendored
@ -107,11 +107,10 @@ jobs:
|
|||||||
# TODO(@getchoo): This is the default in setup-dependencies/windows. Why isn't it working?!?!
|
# TODO(@getchoo): This is the default in setup-dependencies/windows. Why isn't it working?!?!
|
||||||
vcvars-arch: amd64
|
vcvars-arch: amd64
|
||||||
|
|
||||||
- os: windows-2022
|
- os: windows-11-arm
|
||||||
artifact-name: Windows-MSVC-arm64
|
artifact-name: Windows-MSVC-arm64
|
||||||
base-cmake-preset: windows_msvc_arm64_cross
|
base-cmake-preset: windows_msvc
|
||||||
vcvars-arch: amd64_arm64
|
vcvars-arch: arm64
|
||||||
qt-architecture: win64_msvc2022_arm64_cross_compiled
|
|
||||||
|
|
||||||
- os: macos-14
|
- os: macos-14
|
||||||
artifact-name: macOS
|
artifact-name: macOS
|
||||||
|
Loading…
x
Reference in New Issue
Block a user