diff --git a/eng/pipeline/stages/go-builder-matrix-stages.yml b/eng/pipeline/stages/go-builder-matrix-stages.yml index e200cf1531..4b587642fa 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 1509f1194d..5902c905b5 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-14-arm64' + os: macOS diff --git a/eng/pipeline/stages/run-stage.yml b/eng/pipeline/stages/run-stage.yml index 3a5d7af961..8e44a228f5 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