From 7af8907bc0f6df184a766c3bbeebf3b266013424 Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:40:44 -0400 Subject: [PATCH] [GitHub Actions] Windows: Use VCPKG_DEFAULT_HOST_TRIPLET x64-mingw-static --- .github/workflows/CI_windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI_windows.yml b/.github/workflows/CI_windows.yml index d04dffb7885..df14a211a11 100644 --- a/.github/workflows/CI_windows.yml +++ b/.github/workflows/CI_windows.yml @@ -149,6 +149,7 @@ jobs: # Will need to use a similar workaround as Chromium's build process # and use the armasm64.exe tool from MSVC } + $VCPKG_DEFAULT_HOST_TRIPLET = "x64-mingw-static" } else { $WZ_USING_MINGW = "false" @@ -162,8 +163,8 @@ jobs: elseif ($env:WZ_TARGET_ARCH -eq "arm64") { $VCPKG_DEFAULT_TRIPLET = "arm64-windows" } + $VCPKG_DEFAULT_HOST_TRIPLET = "x64-windows" } - $VCPKG_DEFAULT_HOST_TRIPLET = "x64-windows" $WZ_FULL_POWERSHELL_PATH = (Get-Command powershell.exe).Path $WZ_FULL_GIT_PATH = Split-Path -Path ((Get-Command git.exe).Path)