From b09d53010b1ea368c8ef565cd3f1128f6367751c Mon Sep 17 00:00:00 2001
From: George Adams <georgeadams1995@gmail.com>
Date: Fri, 10 Jan 2025 10:49:31 +0000
Subject: [PATCH] add arm64 testing

---
 .../stages/go-builder-matrix-stages.yml         |  4 ++++
 eng/pipeline/stages/pool-2.yml                  |  8 ++++++--
 eng/pipeline/stages/run-stage.yml               | 17 +++++++----------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/eng/pipeline/stages/go-builder-matrix-stages.yml b/eng/pipeline/stages/go-builder-matrix-stages.yml
index e200cf15311..4b587642fa4 100644
--- a/eng/pipeline/stages/go-builder-matrix-stages.yml
+++ b/eng/pipeline/stages/go-builder-matrix-stages.yml
@@ -84,6 +84,10 @@ stages:
           - { os: darwin, arch: amd64, config: test }
           - { experiment: darwincrypto, os: darwin, arch: amd64, config: test }
           - { experiment: darwincrypto, os: darwin, arch: amd64, config: test, fips: true }
+          - { os: darwin, arch: arm64, config: devscript }
+          - { os: darwin, arch: arm64, config: test }
+          - { experiment: darwincrypto, os: darwin, arch: arm64, config: test }
+          - { experiment: darwincrypto, os: darwin, arch: arm64, config: test, fips: true }
           - { os: linux, arch: amd64, config: devscript }
           - { os: linux, arch: amd64, config: test }
           - { 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 1509f1194d5..5e9bbf76427 100644
--- a/eng/pipeline/stages/pool-2.yml
+++ b/eng/pipeline/stages/pool-2.yml
@@ -53,5 +53,9 @@ stages:
 
         ${{ elseif eq(parameters.os, 'darwin') }}:
           # https://learn.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
-          vmImage: 'macos-14'
-          os: macOs
+          ${{ if eq(parameters.hostArch, 'amd64') }}:
+            vmImage: 'macos-14'
+            os: macOS
+          ${{ else }}:
+            vmImage: 'macos-latest-internal'
+            os: macOS
diff --git a/eng/pipeline/stages/run-stage.yml b/eng/pipeline/stages/run-stage.yml
index 3a5d7af9612..8e44a228f57 100644
--- a/eng/pipeline/stages/run-stage.yml
+++ b/eng/pipeline/stages/run-stage.yml
@@ -149,16 +149,13 @@ stages:
 
           # Initialize stage 0 toolset ahead of time so we can track timing data separately from the
           # build operations. When we call this script again later, it won't download Go again.
-          - ${{ if eq(parameters.builder.os, 'darwin') }}:
-            - task: GoTool@0
-              inputs:
-                version: '1.23.3'
-              displayName: Init upstream stage 0 Go toolset
-          - ${{ else }}:
-            - pwsh: |
-                . eng/utilities.ps1
-                Download-Stage0
-              displayName: Init stage 0 Go toolset
+          - pwsh: |
+              . eng/utilities.ps1
+              Download-Stage0
+            env:
+              ${{ if eq(parameters.builder.os, 'darwin') }}:
+                MS_USE_PATH_GO: 1
+            displayName: Init stage 0 Go toolset
 
           - template: ../steps/init-submodule-task.yml