Skip to content

Commit 825dbfa

Browse files
author
Mirroring
committed
Merge commit '5d0ecb2bb02625329d7f8563ddfa08f7b6522538'
2 parents e1f3782 + 5d0ecb2 commit 825dbfa

File tree

2 files changed

+23
-12
lines changed

2 files changed

+23
-12
lines changed

.vsts-ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ parameters:
2222
displayName: Run A Test Build
2323
type: boolean
2424
default: false
25+
- name: enableArm64Job
26+
displayName: Enables the ARM64 job
27+
type: boolean
28+
default: false
2529

2630
variables:
2731
- template: /eng/pipelines/templates/variables/sdk-defaults.yml
@@ -292,7 +296,7 @@ extends:
292296
officialBuildProperties: $(_officialBuildProperties)
293297
runTests: false
294298
### ARM64 TESTBUILD ###
295-
- ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:
299+
- ${{ if and(or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')), eq(parameters.enableArm64Job, true)) }}:
296300
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
297301
parameters:
298302
pool:

.vsts-pr.yml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ pr:
99
- release/*
1010
- internal/release/*
1111

12+
parameters:
13+
- name: enableArm64Job
14+
displayName: Enables the ARM64 job
15+
type: boolean
16+
default: false
17+
1218
variables:
1319
- template: /eng/pipelines/templates/variables/sdk-defaults.yml
1420
# Variables used: DncEngPublicBuildPool
@@ -59,17 +65,18 @@ stages:
5965
os: macOS
6066
helixTargetQueue: osx.13.amd64.open
6167
### ARM64 ###
62-
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
63-
parameters:
64-
pool:
65-
name: Azure Pipelines
66-
vmImage: macOS-latest
67-
os: macOS
68-
helixTargetQueue: osx.13.arm64.open
69-
macOSJobParameterSets:
70-
- categoryName: TestBuild
71-
buildArchitecture: arm64
72-
runtimeIdentifier: osx-arm64
68+
- ${{ if eq(parameters.enableArm64Job, true) }}:
69+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
70+
parameters:
71+
pool:
72+
name: Azure Pipelines
73+
vmImage: macOS-latest
74+
os: macOS
75+
helixTargetQueue: osx.13.arm64.open
76+
macOSJobParameterSets:
77+
- categoryName: TestBuild
78+
buildArchitecture: arm64
79+
runtimeIdentifier: osx-arm64
7380

7481
############### SOURCE BUILD ###############
7582
- template: /eng/common/templates/job/source-build.yml

0 commit comments

Comments
 (0)