Skip to content

Commit b09d530

Browse files
committed
add arm64 testing
1 parent 1227576 commit b09d530

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

eng/pipeline/stages/go-builder-matrix-stages.yml

+4
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ stages:
8484
- { os: darwin, arch: amd64, config: test }
8585
- { experiment: darwincrypto, os: darwin, arch: amd64, config: test }
8686
- { experiment: darwincrypto, os: darwin, arch: amd64, config: test, fips: true }
87+
- { os: darwin, arch: arm64, config: devscript }
88+
- { os: darwin, arch: arm64, config: test }
89+
- { experiment: darwincrypto, os: darwin, arch: arm64, config: test }
90+
- { experiment: darwincrypto, os: darwin, arch: arm64, config: test, fips: true }
8791
- { os: linux, arch: amd64, config: devscript }
8892
- { os: linux, arch: amd64, config: test }
8993
- { os: linux, arch: amd64, config: test, distro: ubuntu }

eng/pipeline/stages/pool-2.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,9 @@ stages:
5353

5454
${{ elseif eq(parameters.os, 'darwin') }}:
5555
# https://learn.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
56-
vmImage: 'macos-14'
57-
os: macOs
56+
${{ if eq(parameters.hostArch, 'amd64') }}:
57+
vmImage: 'macos-14'
58+
os: macOS
59+
${{ else }}:
60+
vmImage: 'macos-latest-internal'
61+
os: macOS

eng/pipeline/stages/run-stage.yml

+7-10
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,13 @@ stages:
149149
150150
# Initialize stage 0 toolset ahead of time so we can track timing data separately from the
151151
# build operations. When we call this script again later, it won't download Go again.
152-
- ${{ if eq(parameters.builder.os, 'darwin') }}:
153-
- task: GoTool@0
154-
inputs:
155-
version: '1.23.3'
156-
displayName: Init upstream stage 0 Go toolset
157-
- ${{ else }}:
158-
- pwsh: |
159-
. eng/utilities.ps1
160-
Download-Stage0
161-
displayName: Init stage 0 Go toolset
152+
- pwsh: |
153+
. eng/utilities.ps1
154+
Download-Stage0
155+
env:
156+
${{ if eq(parameters.builder.os, 'darwin') }}:
157+
MS_USE_PATH_GO: 1
158+
displayName: Init stage 0 Go toolset
162159
163160
- template: ../steps/init-submodule-task.yml
164161

0 commit comments

Comments
 (0)