From 9792414ae914f1aab6258cd6419d4827036f597c Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 12 Jun 2025 21:31:03 -0400 Subject: [PATCH 1/2] ci(setup-deps): pin ccache-action for WoA fix Signed-off-by: Seth Flynn --- .github/actions/setup-dependencies/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup-dependencies/action.yml b/.github/actions/setup-dependencies/action.yml index 47a9819ea..71785a384 100644 --- a/.github/actions/setup-dependencies/action.yml +++ b/.github/actions/setup-dependencies/action.yml @@ -54,7 +54,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' }} From 438f1b8500572f7c71892f185b310677be49d0fd Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 12 Jun 2025 20:59:33 -0400 Subject: [PATCH 2/2] [skip ci] ci: build for windows on arm with msvc natively Signed-off-by: Seth Flynn --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4954328a9..ddde0be7e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -101,11 +101,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