Skip to content

Commit c11ab0b

Browse files
walbournwalbourn
authored
Cleanup of ADO pipeline YAML files (microsoft#249)
1 parent 304e90e commit c11ab0b

File tree

15 files changed

+321
-647
lines changed

15 files changed

+321
-647
lines changed

‎.azuredevops/pipelines/DirectXMath-GitHub-CMake.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ trigger:
2020
exclude:
2121
- '*.md'
2222
- LICENSE
23-
- '.github/*'
23+
- '.github/**'
2424
- '.nuget/*'
2525
- build/*.ps1
2626

@@ -32,7 +32,7 @@ pr:
3232
exclude:
3333
- '*.md'
3434
- LICENSE
35-
- '.github/*'
35+
- '.github/**'
3636
- '.nuget/*'
3737

3838
resources:

‎.azuredevops/pipelines/DirectXMath-GitHub-Dev17.yml‎

Lines changed: 91 additions & 227 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,28 @@ jobs:
4646
- job: BUILD_DEV17
4747
displayName: 'Visual Studio 2022 (v143)'
4848
cancelTimeoutInMinutes: 1
49+
strategy:
50+
maxParallel: 6
51+
matrix:
52+
Release_arm64:
53+
BuildPlatform: ARM64
54+
BuildConfiguration: Release
55+
Debug_arm64:
56+
BuildPlatform: ARM64
57+
BuildConfiguration: Debug
58+
Release_x64:
59+
BuildPlatform: x64
60+
BuildConfiguration: Release
61+
Debug_x64:
62+
BuildPlatform: x64
63+
BuildConfiguration: Debug
64+
Release_x86:
65+
BuildPlatform: x86
66+
BuildConfiguration: Release
67+
Debug_x86:
68+
BuildPlatform: x86
69+
BuildConfiguration: Debug
70+
4971
steps:
5072
- checkout: self
5173
clean: true
@@ -59,276 +81,118 @@ jobs:
5981
fetchDepth: 1
6082
path: 's/Tests'
6183
- task: VSBuild@1
62-
displayName: Build solution math3_2022.sln x86dbg
63-
inputs:
64-
solution: Tests/math3/math3_2022.sln
65-
vsVersion: 17.0
66-
platform: x86
67-
configuration: Debug
68-
msbuildArchitecture: x64
69-
- task: VSBuild@1
70-
displayName: Build solution math3_2022.sln x86rel
71-
inputs:
72-
solution: Tests/math3/math3_2022.sln
73-
vsVersion: 17.0
74-
platform: x86
75-
configuration: Release
76-
msbuildArchitecture: x64
77-
- task: VSBuild@1
78-
displayName: Build solution math3_2022.sln x64dbg
79-
inputs:
80-
solution: Tests/math3/math3_2022.sln
81-
vsVersion: 17.0
82-
platform: x64
83-
configuration: Debug
84-
msbuildArchitecture: x64
85-
- task: VSBuild@1
86-
displayName: Build solution math3_2022.sln x64rel
87-
inputs:
88-
solution: Tests/math3/math3_2022.sln
89-
vsVersion: 17.0
90-
platform: x64
91-
configuration: Release
92-
msbuildArchitecture: x64
93-
- task: VSBuild@1
94-
displayName: Build solution math3_2022.sln arm64dbg
95-
inputs:
96-
solution: Tests/math3/math3_2022.sln
97-
vsVersion: 17.0
98-
platform: ARM64
99-
configuration: Debug
100-
msbuildArchitecture: x64
101-
- task: VSBuild@1
102-
displayName: Build solution math3_2022.sln arm64rel
103-
inputs:
104-
solution: Tests/math3/math3_2022.sln
105-
vsVersion: 17.0
106-
platform: ARM64
107-
configuration: Release
108-
msbuildArchitecture: x64
109-
- task: VSBuild@1
110-
displayName: Build solution math3_2022.sln x86dbg sse3
111-
inputs:
112-
solution: Tests/math3/math3_2022.sln
113-
vsVersion: 17.0
114-
platform: x86
115-
configuration: SSE3 Debug
116-
msbuildArchitecture: x64
117-
- task: VSBuild@1
118-
displayName: Build solution math3_2022.sln x86rel sse3
119-
inputs:
120-
solution: Tests/math3/math3_2022.sln
121-
vsVersion: 17.0
122-
platform: x86
123-
configuration: SSE3 Release
124-
msbuildArchitecture: x64
125-
- task: VSBuild@1
126-
displayName: Build solution math3_2022.sln x64dbg sse3
127-
inputs:
128-
solution: Tests/math3/math3_2022.sln
129-
vsVersion: 17.0
130-
platform: x64
131-
configuration: SSE3 Debug
132-
msbuildArchitecture: x64
133-
- task: VSBuild@1
134-
displayName: Build solution math3_2022.sln x64rel sse3
135-
inputs:
136-
solution: Tests/math3/math3_2022.sln
137-
vsVersion: 17.0
138-
platform: x64
139-
configuration: SSE3 Release
140-
msbuildArchitecture: x64
141-
- task: VSBuild@1
142-
displayName: Build solution math3_2022.sln x86dbg sse4
143-
inputs:
144-
solution: Tests/math3/math3_2022.sln
145-
vsVersion: 17.0
146-
platform: x86
147-
configuration: SSE4 Debug
148-
msbuildArchitecture: x64
149-
- task: VSBuild@1
150-
displayName: Build solution math3_2022.sln x86rel sse4
151-
inputs:
152-
solution: Tests/math3/math3_2022.sln
153-
vsVersion: 17.0
154-
platform: x86
155-
configuration: SSE4 Release
156-
msbuildArchitecture: x64
157-
- task: VSBuild@1
158-
displayName: Build solution math3_2022.sln x64dbg sse4
159-
inputs:
160-
solution: Tests/math3/math3_2022.sln
161-
vsVersion: 17.0
162-
platform: x64
163-
configuration: SSE4 Debug
164-
msbuildArchitecture: x64
165-
- task: VSBuild@1
166-
displayName: Build solution math3_2022.sln x64rel sse4
167-
inputs:
168-
solution: Tests/math3/math3_2022.sln
169-
vsVersion: 17.0
170-
platform: x64
171-
configuration: SSE4 Release
172-
msbuildArchitecture: x64
173-
- task: VSBuild@1
174-
displayName: Build solution math3_2022.sln x86dbg avx
175-
inputs:
176-
solution: Tests/math3/math3_2022.sln
177-
vsVersion: 17.0
178-
platform: x86
179-
configuration: AVX Debug
180-
msbuildArchitecture: x64
181-
- task: VSBuild@1
182-
displayName: Build solution math3_2022.sln x86rel avx
183-
inputs:
184-
solution: Tests/math3/math3_2022.sln
185-
vsVersion: 17.0
186-
platform: x86
187-
configuration: AVX Release
188-
msbuildArchitecture: x64
189-
- task: VSBuild@1
190-
displayName: Build solution math3_2022.sln x64dbg avx
191-
inputs:
192-
solution: Tests/math3/math3_2022.sln
193-
vsVersion: 17.0
194-
platform: x64
195-
configuration: AVX Debug
196-
msbuildArchitecture: x64
197-
- task: VSBuild@1
198-
displayName: Build solution math3_2022.sln x64rel avx
199-
inputs:
200-
solution: Tests/math3/math3_2022.sln
201-
vsVersion: 17.0
202-
platform: x64
203-
configuration: AVX Release
204-
msbuildArchitecture: x64
205-
- task: VSBuild@1
206-
displayName: Build solution math3_2022.sln x86dbg avx2
207-
inputs:
208-
solution: Tests/math3/math3_2022.sln
209-
vsVersion: 17.0
210-
platform: x86
211-
configuration: AVX2 Debug
212-
msbuildArchitecture: x64
213-
- task: VSBuild@1
214-
displayName: Build solution math3_2022.sln x86rel avx2
215-
inputs:
216-
solution: Tests/math3/math3_2022.sln
217-
vsVersion: 17.0
218-
platform: x86
219-
configuration: AVX2 Release
220-
msbuildArchitecture: x64
221-
- task: VSBuild@1
222-
displayName: Build solution math3_2022.sln x64dbg avx2
223-
inputs:
224-
solution: Tests/math3/math3_2022.sln
225-
vsVersion: 17.0
226-
platform: x64
227-
configuration: AVX2 Debug
228-
msbuildArchitecture: x64
229-
- task: VSBuild@1
230-
displayName: Build solution math3_2022.sln x64rel avx2
231-
inputs:
232-
solution: Tests/math3/math3_2022.sln
233-
vsVersion: 17.0
234-
platform: x64
235-
configuration: AVX2 Release
236-
msbuildArchitecture: x64
237-
- task: VSBuild@1
238-
displayName: Build solution math3_2022.sln x86dbg nointrinsics
239-
inputs:
240-
solution: Tests/math3/math3_2022.sln
241-
vsVersion: 17.0
242-
platform: x86
243-
configuration: NI Debug
244-
msbuildArchitecture: x64
245-
- task: VSBuild@1
246-
displayName: Build solution math3_2022.sln x86rel nointrinsics
84+
displayName: Build solution math3_2022.sln
24785
inputs:
24886
solution: Tests/math3/math3_2022.sln
24987
vsVersion: 17.0
250-
platform: x86
251-
configuration: NI Release
88+
platform: '$(BuildPlatform)'
89+
configuration: '$(BuildConfiguration)'
25290
msbuildArchitecture: x64
25391
- task: VSBuild@1
254-
displayName: Build solution math3_2022.sln x64dbg nointrinsics
92+
displayName: Build solution math3_2022.sln no-intrinsics
25593
inputs:
25694
solution: Tests/math3/math3_2022.sln
25795
vsVersion: 17.0
258-
platform: x64
259-
configuration: NI Debug
96+
platform: '$(BuildPlatform)'
97+
configuration: 'NI $(BuildConfiguration)'
26098
msbuildArchitecture: x64
26199
- task: VSBuild@1
262-
displayName: Build solution math3_2022.sln x64rel nointrinsics
100+
displayName: Build solution math3_2022.sln SSE3
263101
inputs:
264102
solution: Tests/math3/math3_2022.sln
265103
vsVersion: 17.0
266-
platform: x64
267-
configuration: NI Release
104+
platform: '$(BuildPlatform)'
105+
configuration: 'SSE3 $(BuildConfiguration)'
268106
msbuildArchitecture: x64
107+
condition: ne(variables['BuildPlatform'], 'ARM64')
269108
- task: VSBuild@1
270-
displayName: Build solution math3_2022.sln arm64dbg nointrinsics
109+
displayName: Build solution math3_2022.sln SSE4
271110
inputs:
272111
solution: Tests/math3/math3_2022.sln
273112
vsVersion: 17.0
274-
platform: ARM64
275-
configuration: NI Debug
113+
platform: '$(BuildPlatform)'
114+
configuration: 'SSE4 $(BuildConfiguration)'
276115
msbuildArchitecture: x64
116+
condition: ne(variables['BuildPlatform'], 'ARM64')
277117
- task: VSBuild@1
278-
displayName: Build solution math3_2022.sln arm86rel nointrinsics
118+
displayName: Build solution math3_2022.sln AVX
279119
inputs:
280120
solution: Tests/math3/math3_2022.sln
281121
vsVersion: 17.0
282-
platform: ARM64
283-
configuration: NI Release
122+
platform: '$(BuildPlatform)'
123+
configuration: 'AVX $(BuildConfiguration)'
284124
msbuildArchitecture: x64
125+
condition: ne(variables['BuildPlatform'], 'ARM64')
285126
- task: VSBuild@1
286-
displayName: Build solution math3_2022.sln x86dbg x87
127+
displayName: Build solution math3_2022.sln AVX2
287128
inputs:
288129
solution: Tests/math3/math3_2022.sln
289130
vsVersion: 17.0
290-
platform: x86
291-
configuration: x87 Debug
131+
platform: '$(BuildPlatform)'
132+
configuration: 'AVX2 $(BuildConfiguration)'
292133
msbuildArchitecture: x64
134+
condition: ne(variables['BuildPlatform'], 'ARM64')
293135
- task: VSBuild@1
294-
displayName: Build solution math3_2022.sln x86rel x87
136+
displayName: Build solution math3_2022.sln x87
295137
inputs:
296138
solution: Tests/math3/math3_2022.sln
297139
vsVersion: 17.0
298-
platform: x86
299-
configuration: x87 Release
300-
msbuildArchitecture: x64
301-
- task: VSBuild@1
302-
displayName: Build solution shmath_2022.sln x64dbg
303-
inputs:
304-
solution: Tests/shmath/shmath_2022.sln
305-
vsVersion: 17.0
306-
platform: x64
307-
configuration: Debug
140+
platform: '$(BuildPlatform)'
141+
configuration: 'x87 $(BuildConfiguration)'
308142
msbuildArchitecture: x64
143+
condition: eq(variables['BuildPlatform'], 'x86')
144+
145+
- job: BUILD_EXTS
146+
displayName: 'Visual Studio 2022 (v143) SHMath and XDSP'
147+
cancelTimeoutInMinutes: 1
148+
strategy:
149+
maxParallel: 2
150+
matrix:
151+
Release_arm64:
152+
BuildPlatform: ARM64
153+
BuildConfiguration: Release
154+
Debug_arm64:
155+
BuildPlatform: ARM64
156+
BuildConfiguration: Debug
157+
Release_x64:
158+
BuildPlatform: x64
159+
BuildConfiguration: Release
160+
Debug_x64:
161+
BuildPlatform: x64
162+
BuildConfiguration: Debug
163+
Release_x86:
164+
BuildPlatform: x86
165+
BuildConfiguration: Release
166+
Debug_x86:
167+
BuildPlatform: x86
168+
BuildConfiguration: Debug
169+
steps:
170+
- checkout: self
171+
clean: true
172+
fetchTags: false
173+
fetchDepth: 1
174+
path: 's'
175+
- checkout: testRepo
176+
displayName: Fetch Tests
177+
clean: true
178+
fetchTags: false
179+
fetchDepth: 1
180+
path: 's/Tests'
309181
- task: VSBuild@1
310-
displayName: Build solution shmath_2022.sln x64rel
182+
displayName: Build solution shmath_2022.sln
311183
inputs:
312184
solution: Tests/shmath/shmath_2022.sln
313185
vsVersion: 17.0
314-
platform: x64
315-
configuration: Release
316-
msbuildArchitecture: x64
317-
- task: VSBuild@1
318-
displayName: Build solution XDSPTest_2022 x64dbg
319-
inputs:
320-
solution: Tests/xdsp/XDSPTest_2022.sln
321-
vsVersion: 17.0
322-
platform: x64
323-
configuration: Debug
186+
platform: '$(BuildPlatform)'
187+
configuration: '$(BuildConfiguration)'
324188
msbuildArchitecture: x64
325189
- task: VSBuild@1
326-
displayName: Build solution XDSPTest_2022 x64rel
190+
displayName: Build solution XDSPTest_2022
327191
inputs:
328192
solution: Tests/xdsp/XDSPTest_2022.sln
329193
vsVersion: 17.0
330-
platform: x64
331-
configuration: Release
194+
platform: '$(BuildPlatform)'
195+
configuration: '$(BuildConfiguration)'
332196
msbuildArchitecture: x64
333197

334198
- job: CMAKE_BUILD_X64

0 commit comments

Comments
 (0)