From f4015c5ba22985aca8720f3847900f75f06dca30 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Mon, 19 Jan 2026 23:30:16 -0700 Subject: [PATCH] ci: Use older win64 toolchain container for Windows arm64 builds --- .github/workflows/build-windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 64e3776def..d3af02b9e3 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -17,7 +17,7 @@ jobs: arch: [x86_64, arm64] configuration: [debug, release] container: - image: ghcr.io/xemu-project/xemu-win64-toolchain-${{ matrix.arch == 'x86_64' && 'gcc:sha-18018f1' || 'llvm:sha-18018f1' }} + image: ghcr.io/xemu-project/xemu-win64-toolchain${{ matrix.arch == 'x86_64' && '-gcc:sha-18018f1' || ':sha-0d06ce8' }} defaults: run: shell: bash @@ -25,6 +25,8 @@ jobs: CCACHE_DIR: /tmp/xemu-ccache CCACHE_MAXSIZE: 512M LTO_CACHE_DIR: /tmp/xemu-lto-ccache + CROSSPREFIX: ${{ matrix.arch == 'arm64' && 'aarch64' || 'x86_64' }}-w64-mingw32.static- + CROSSAR: ${{ matrix.arch == 'arm64' && 'aarch64' || 'x86_64' }}-w64-mingw32.static-${{ matrix.arch == 'arm64' && 'ar' || 'gcc-ar' }} steps: - name: Download source package uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v4