Skip to content

Commit 1dd19ae

Browse files
committed
Remove modifications to main CI
Working with the engineering system team to make a new pipeline in azdo since I cannot. adding this bloat to the main SDK pipeline is not the ideal approach.
1 parent b3b7bbd commit 1dd19ae

File tree

2 files changed

+27
-118
lines changed

2 files changed

+27
-118
lines changed

.vsts-pr.yml

Lines changed: 27 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ pr:
88
- main
99
- release/*
1010
- internal/release/*
11-
- dnup
1211
paths:
1312
exclude:
1413
- documentation/*
@@ -25,98 +24,56 @@ variables:
2524
- template: /eng/pipelines/templates/variables/sdk-defaults.yml
2625
# Variables used: DncEngPublicBuildPool
2726
- template: /eng/common/templates/variables/pool-providers.yml
28-
# Variable to determine if PR changes are limited to dnup paths
29-
- name: isDnupOnlyChanges
30-
value: $[in(variables['Build.Reason'], 'PullRequest', 'Manual')]
3127

3228
resources:
3329
containers:
3430
- container: azureLinux30Amd64
3531
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
3632

3733
stages:
38-
############### FILTER CHANGES STAGE ###############
39-
- stage: filter_changes
40-
displayName: Filter PR Changes
34+
############### BUILD STAGE ###############
35+
- stage: build
36+
displayName: Build
4137
jobs:
42-
- template: /eng/pipelines/templates/jobs/filter-dnup-changes.yml
38+
############### WINDOWS ###############
39+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
4340
parameters:
4441
pool:
4542
name: $(DncEngPublicBuildPool)
4643
demands: ImageOverride -equals windows.vs2022.amd64.open
47-
48-
############### BUILD STAGE ###############
49-
- stage: build
50-
displayName: Build
51-
dependsOn: filter_changes
52-
variables:
53-
isDnupOnlyChanges: $[ stageDependencies.filter_changes.FilterDnupChanges.outputs['SetDnupFlag.isDnupOnlyChanges'] ]
54-
jobs:
55-
# If changes are dnup-only, run only dnup tests
56-
- ${{ if eq(variables['isDnupOnlyChanges'], 'true') }}:
57-
############### DNUP TESTS ONLY ###############
58-
- template: /eng/pipelines/templates/jobs/dnup-tests.yml
59-
parameters:
60-
pool:
61-
name: $(DncEngPublicBuildPool)
62-
demands: ImageOverride -equals windows.vs2022.amd64.open
6344
os: windows
45+
helixTargetQueue: windows.amd64.vs2022.pre.open
6446

65-
- template: /eng/pipelines/templates/jobs/dnup-tests.yml
66-
parameters:
67-
pool:
68-
name: $(DncEngPublicBuildPool)
69-
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
47+
############### LINUX ###############
48+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
49+
parameters:
50+
pool:
51+
name: $(DncEngPublicBuildPool)
52+
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
7053
os: linux
54+
helixTargetQueue: ubuntu.2204.amd64.open
7155

72-
- template: /eng/pipelines/templates/jobs/dnup-tests.yml
73-
parameters:
74-
pool:
75-
name: Azure Pipelines
76-
vmImage: macOS-latest
56+
############### MACOS ###############
57+
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
58+
parameters:
59+
pool:
60+
name: Azure Pipelines
61+
vmImage: macOS-latest
7762
os: macOS
78-
79-
# Otherwise run the full SDK matrix
80-
- ${{ if ne(variables['isDnupOnlyChanges'], 'true') }}:
81-
############### WINDOWS ###############
82-
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
83-
parameters:
84-
pool:
85-
name: $(DncEngPublicBuildPool)
86-
demands: ImageOverride -equals windows.vs2022.amd64.open
87-
os: windows
88-
helixTargetQueue: windows.amd64.vs2022.pre.open
89-
90-
############### LINUX ###############
91-
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
92-
parameters:
93-
pool:
94-
name: $(DncEngPublicBuildPool)
95-
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
96-
os: linux
97-
helixTargetQueue: ubuntu.2204.amd64.open
98-
99-
############### MACOS ###############
63+
helixTargetQueue: osx.15.amd64.open
64+
### ARM64 ###
65+
- ${{ if eq(parameters.enableArm64Job, true) }}:
10066
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
10167
parameters:
10268
pool:
10369
name: Azure Pipelines
10470
vmImage: macOS-latest
10571
os: macOS
106-
helixTargetQueue: osx.15.amd64.open
107-
### ARM64 ###
108-
- ${{ if eq(parameters.enableArm64Job, true) }}:
109-
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
110-
parameters:
111-
pool:
112-
name: Azure Pipelines
113-
vmImage: macOS-latest
114-
os: macOS
115-
helixTargetQueue: osx.13.arm64.open
116-
macOSJobParameterSets:
117-
- categoryName: TestBuild
118-
targetArchitecture: arm64
119-
runtimeIdentifier: osx-arm64
72+
helixTargetQueue: osx.13.arm64.open
73+
macOSJobParameterSets:
74+
- categoryName: TestBuild
75+
targetArchitecture: arm64
76+
runtimeIdentifier: osx-arm64
12077

12178
############### DOTNET-FORMAT ###############
12279
- template: /eng/dotnet-format/dotnet-format-integration.yml

eng/pipelines/templates/jobs/filter-dnup-changes.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)