From b1dabeba0561ec8bb56601e969978c66123e3eb7 Mon Sep 17 00:00:00 2001
From: George Adams <georgeadams1995@gmail.com>
Date: Mon, 8 Jun 2026 12:19:25 +0100
Subject: [PATCH] Switch Windows ARM64 from cross-compile to native build and
 test

Use windows.11.arm64 / windows.11.arm64.open pools for native Windows
ARM64 builds. Remove hostArch: amd64 from the buildandpack entry and
enable innerloop test configurations (nosystemcrypto, systemcrypto,
FIPS).
---
 eng/pipeline/stages/go-builder-matrix-stages.yml |  6 ++++--
 eng/pipeline/stages/pool-2.yml                   | 11 ++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/eng/pipeline/stages/go-builder-matrix-stages.yml b/eng/pipeline/stages/go-builder-matrix-stages.yml
index 9e82b766778..2a5b8c1ca80 100644
--- a/eng/pipeline/stages/go-builder-matrix-stages.yml
+++ b/eng/pipeline/stages/go-builder-matrix-stages.yml
@@ -71,7 +71,7 @@ stages:
           - { os: windows, arch: amd64, config: buildandpack }
           - { os: linux, arch: arm, hostArch: amd64, config: buildandpack }
           - { os: linux, arch: arm64, hostArch: amd64, config: buildandpack }
-          - { os: windows, arch: arm64, hostArch: amd64, config: buildandpack }
+          - { os: windows, arch: arm64, config: buildandpack }
           - { os: darwin, arch: amd64, config: buildandpack }
           - { os: darwin, arch: arm64, config: buildandpack }
           - ${{ if parameters.includeArm64Host }}:
@@ -86,7 +86,9 @@ stages:
           - { nosystemcrypto: true, os: darwin, arch: arm64, config: test }
           - { os: darwin, arch: arm64, config: test }
           - { os: darwin, arch: arm64, config: test, fips: true }
-          # - { nosystemcrypto: true, os: windows, arch: arm64, config: test }
+          - { nosystemcrypto: true, os: windows, arch: arm64, config: test }
+          - { os: windows, arch: arm64, config: test }
+          - { os: windows, arch: arm64, config: test, fips: true }
           - { nosystemcrypto: true, os: linux, arch: amd64, config: devscript }
           - { nosystemcrypto: true, os: linux, arch: amd64, config: test }
           - { nosystemcrypto: true, os: linux, arch: amd64, config: test, distro: ubuntu }
diff --git a/eng/pipeline/stages/pool-2.yml b/eng/pipeline/stages/pool-2.yml
index c560822a1b0..e2df32674b7 100644
--- a/eng/pipeline/stages/pool-2.yml
+++ b/eng/pipeline/stages/pool-2.yml
@@ -32,7 +32,16 @@ stages:
         name: ${{ parameters.name }}
 
         ${{ if eq(parameters.os, 'windows') }}:
-          ${{ if parameters.ctx['Go1ESOfficial'] }}:
+          ${{ if eq(parameters.hostArch, 'arm64') }}:
+            ${{ if parameters.ctx['Go1ESOfficial'] }}:
+              image: windows.11.arm64
+              os: windows
+            ${{ elseif parameters.public }}:
+              demands: ImageOverride -equals windows.11.arm64.open
+            ${{ else }}:
+              demands: ImageOverride -equals windows.11.arm64
+              os: windows
+          ${{ elseif parameters.ctx['Go1ESOfficial'] }}:
             image: 1es-windows-${{ parameters.distro }}
             os: windows
           ${{ elseif parameters.public }}: