diff --git a/eng/pipeline/stages/go-builder-matrix-stages.yml b/eng/pipeline/stages/go-builder-matrix-stages.yml index bb80ca4a68c..01d5c60a08f 100644 --- a/eng/pipeline/stages/go-builder-matrix-stages.yml +++ b/eng/pipeline/stages/go-builder-matrix-stages.yml @@ -71,6 +71,8 @@ stages: - { os: windows, arch: amd64, config: buildandpack } - { os: linux, arch: arm, hostArch: amd64, config: buildandpack } - { os: linux, arch: arm64, hostArch: amd64, config: buildandpack } + - { os: darwin, arch: amd64, config: buildandpack } + - { os: darwin, arch: arm64, hostArch: amd64, config: buildandpack } - ${{ if parameters.includeArm64Host }}: - { os: linux, arch: arm64, config: buildandpack } - ${{ if parameters.innerloop }}: @@ -88,8 +90,8 @@ stages: - { experiment: cngcrypto, os: windows, arch: amd64, config: test, fips: true } # Test that buildandpack works on Windows x86-32, but don't release it. - { os: windows, hostArch: amd64, arch: 386, config: buildandpack } - - { os: macos, arch: amd64, config: devscript } - - { os: macos, arch: amd64, config: test } + - { os: darwin, arch: amd64, config: devscript } + - { os: darwin, arch: amd64, config: test } - ${{ if parameters.outerloop }}: # Upstream builders. # - { os: linux, arch: amd64, config: clang } https://github.com/microsoft/go/issues/342 diff --git a/eng/pipeline/stages/pool-1.yml b/eng/pipeline/stages/pool-1.yml index edb92053c6e..a53b4a72498 100644 --- a/eng/pipeline/stages/pool-1.yml +++ b/eng/pipeline/stages/pool-1.yml @@ -22,7 +22,9 @@ stages: parameters: ${{ insert }}: ${{ parameters }} - ${{ if eq(parameters.hostArch, 'arm64') }}: + ${{ if eq(parameters.os, 'darwin') }}: + name: Azure Pipelines # use the default AzDo hosted pool + ${{ elseif and(eq(parameters.hostArch, 'arm64'), eq(parameters.os, 'linux')) }}: name: Docker-Linux-Arm-Internal ${{ else }}: ${{ if parameters.public }}: diff --git a/eng/pipeline/stages/pool-2.yml b/eng/pipeline/stages/pool-2.yml index 723726c3a21..d7b9020389d 100644 --- a/eng/pipeline/stages/pool-2.yml +++ b/eng/pipeline/stages/pool-2.yml @@ -51,12 +51,6 @@ stages: demands: ImageOverride -equals 1es-ubuntu-2004 os: linux - ${{ elseif eq(parameters.os, 'macos') }}: - ${{ if parameters.official }}: - image: osx.14.amd64 - os: macos - ${{ elseif parameters.public }}: - demands: ImageOverride -equals osx.14.amd64.open - ${{ else }}: - demands: ImageOverride -equals osx.14.amd64 - os: macos + ${{ 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'