Skip to content

Commit 8100413

Browse files
walbournwalbourn
authored
Cleanup of ADO pipeline YAML files (#230)
1 parent f431534 commit 8100413

25 files changed

+520
-820
lines changed

‎.azuredevops/pipelines/DirectXMesh-GitHub-CMake-Dev17.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/*.cmd
2626
- build/*.props
@@ -36,7 +36,7 @@ pr:
3636
exclude:
3737
- '*.md'
3838
- LICENSE
39-
- '.github/*'
39+
- '.github/**'
4040
- '.nuget/*'
4141
- build/*.cmd
4242
- build/*.props

‎.azuredevops/pipelines/DirectXMesh-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/*.cmd
2626
- build/*.props
@@ -36,7 +36,7 @@ pr:
3636
exclude:
3737
- '*.md'
3838
- LICENSE
39-
- '.github/*'
39+
- '.github/**'
4040
- '.nuget/*'
4141
- build/*.cmd
4242
- build/*.props

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

Lines changed: 85 additions & 205 deletions
Original file line numberDiff line numberDiff line change
@@ -38,236 +38,116 @@ pool:
3838

3939
jobs:
4040
- job: DESKTOP_BUILD
41-
displayName: 'Win32 Desktop'
41+
displayName: 'Windows Desktop'
4242
timeoutInMinutes: 120
4343
cancelTimeoutInMinutes: 1
44+
strategy:
45+
maxParallel: 3
46+
matrix:
47+
Release_arm64:
48+
BuildPlatform: ARM64
49+
BuildConfiguration: Release
50+
SpectreMitigation: false
51+
Debug_arm64:
52+
BuildPlatform: ARM64
53+
BuildConfiguration: Debug
54+
SpectreMitigation: false
55+
Release_x64:
56+
BuildPlatform: x64
57+
BuildConfiguration: Release
58+
SpectreMitigation: false
59+
Debug_x64:
60+
BuildPlatform: x64
61+
BuildConfiguration: Debug
62+
SpectreMitigation: false
63+
Release_x86:
64+
BuildPlatform: x86
65+
BuildConfiguration: Release
66+
SpectreMitigation: false
67+
Debug_x86:
68+
BuildPlatform: x86
69+
BuildConfiguration: Debug
70+
SpectreMitigation: false
71+
Release_arm64_SpectreMitigated:
72+
BuildPlatform: ARM64
73+
BuildConfiguration: Release
74+
SpectreMitigation: 'Spectre'
75+
Debug_arm64_SpectreMitigated:
76+
BuildPlatform: ARM64
77+
BuildConfiguration: Debug
78+
SpectreMitigation: 'Spectre'
79+
Release_x64_SpectreMitigated:
80+
BuildPlatform: x64
81+
BuildConfiguration: Release
82+
SpectreMitigation: 'Spectre'
83+
Debug_x64_SpectreMitigated:
84+
BuildPlatform: x64
85+
BuildConfiguration: Debug
86+
SpectreMitigation: 'Spectre'
87+
Release_x86_SpectreMitigated:
88+
BuildPlatform: x86
89+
BuildConfiguration: Release
90+
SpectreMitigation: 'Spectre'
91+
Debug_x86_SpectreMitigated:
92+
BuildPlatform: x86
93+
BuildConfiguration: Debug
94+
SpectreMitigation: 'Spectre'
4495
steps:
4596
- checkout: self
4697
clean: true
4798
fetchTags: false
4899
- task: VSBuild@1
49-
displayName: Build solution DirectXMesh_Desktop_2022.sln 32dbg
100+
displayName: Build solution DirectXMesh_Desktop_2022.sln
50101
inputs:
51102
solution: DirectXMesh_Desktop_2022.sln
52-
msbuildArgs: /p:PreferredToolArchitecture=x64
53-
platform: x86
54-
configuration: Debug
55-
msbuildArchitecture: x64
56-
- task: VSBuild@1
57-
displayName: Build solution DirectXMesh_Desktop_2022.sln 32rel
58-
inputs:
59-
solution: DirectXMesh_Desktop_2022.sln
60-
msbuildArgs: /p:PreferredToolArchitecture=x64
61-
platform: x86
62-
configuration: Release
63-
msbuildArchitecture: x64
64-
- task: VSBuild@1
65-
displayName: Build solution DirectXMesh_Desktop_2022.sln 64dbg
66-
inputs:
67-
solution: DirectXMesh_Desktop_2022.sln
68-
msbuildArgs: /p:PreferredToolArchitecture=x64
69-
platform: x64
70-
configuration: Debug
71-
msbuildArchitecture: x64
72-
- task: VSBuild@1
73-
displayName: Build solution DirectXMesh_Desktop_2022.sln 64rel
74-
inputs:
75-
solution: DirectXMesh_Desktop_2022.sln
76-
msbuildArgs: /p:PreferredToolArchitecture=x64
77-
platform: x64
78-
configuration: Release
79-
msbuildArchitecture: x64
80-
- task: VSBuild@1
81-
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln 32dbg
82-
inputs:
83-
solution: DirectXMesh_Desktop_2022_Win10.sln
84-
msbuildArgs: /p:PreferredToolArchitecture=x64
85-
platform: x86
86-
configuration: Debug
87-
msbuildArchitecture: x64
88-
- task: VSBuild@1
89-
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln 32rel
90-
inputs:
91-
solution: DirectXMesh_Desktop_2022_Win10.sln
92-
msbuildArgs: /p:PreferredToolArchitecture=x64
93-
platform: x86
94-
configuration: Release
95-
msbuildArchitecture: x64
96-
- task: VSBuild@1
97-
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln 64dbg
98-
inputs:
99-
solution: DirectXMesh_Desktop_2022_Win10.sln
100-
msbuildArgs: /p:PreferredToolArchitecture=x64
101-
platform: x64
102-
configuration: Debug
103-
msbuildArchitecture: x64
104-
- task: VSBuild@1
105-
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln 64rel
106-
inputs:
107-
solution: DirectXMesh_Desktop_2022_Win10.sln
108-
msbuildArgs: /p:PreferredToolArchitecture=x64
109-
platform: x64
110-
configuration: Release
111-
msbuildArchitecture: x64
112-
- task: VSBuild@1
113-
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln arm64dbg
114-
inputs:
115-
solution: DirectXMesh_Desktop_2022_Win10.sln
116-
msbuildArgs: /p:PreferredToolArchitecture=x64
117-
platform: ARM64
118-
configuration: Debug
119-
msbuildArchitecture: x64
120-
- task: VSBuild@1
121-
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln arm64rel
122-
inputs:
123-
solution: DirectXMesh_Desktop_2022_Win10.sln
124-
msbuildArgs: /p:PreferredToolArchitecture=x64
125-
platform: ARM64
126-
configuration: Release
127-
msbuildArchitecture: x64
128-
129-
- job: DESKTOP_BUILD_SPECTRE
130-
displayName: 'Win32 Desktop (Spectre-mitigated)'
131-
timeoutInMinutes: 120
132-
cancelTimeoutInMinutes: 1
133-
steps:
134-
- checkout: self
135-
clean: true
136-
fetchTags: false
137-
- task: VSBuild@1
138-
displayName: Build solution DirectXMesh_Desktop_2022.sln 32dbg
139-
inputs:
140-
solution: DirectXMesh_Desktop_2022.sln
141-
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
142-
platform: x86
143-
configuration: Debug
103+
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=$(SpectreMitigation)
104+
platform: '$(BuildPlatform)'
105+
configuration: '$(BuildConfiguration)'
144106
msbuildArchitecture: x64
107+
condition: ne(variables['BuildPlatform'], 'ARM64')
145108
- task: VSBuild@1
146-
displayName: Build solution DirectXMesh_Desktop_2022.sln 32rel
147-
inputs:
148-
solution: DirectXMesh_Desktop_2022.sln
149-
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
150-
platform: x86
151-
configuration: Release
152-
msbuildArchitecture: x64
153-
- task: VSBuild@1
154-
displayName: Build solution DirectXMesh_Desktop_2022.sln 64dbg
155-
inputs:
156-
solution: DirectXMesh_Desktop_2022.sln
157-
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
158-
platform: x64
159-
configuration: Debug
160-
msbuildArchitecture: x64
161-
- task: VSBuild@1
162-
displayName: Build solution DirectXMesh_Desktop_2022.sln 64rel
163-
inputs:
164-
solution: DirectXMesh_Desktop_2022.sln
165-
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
166-
platform: x64
167-
configuration: Release
168-
msbuildArchitecture: x64
169-
- task: VSBuild@1
170-
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln 32dbg
109+
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln
171110
inputs:
172111
solution: DirectXMesh_Desktop_2022_Win10.sln
173-
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
174-
platform: x86
175-
configuration: Debug
176-
msbuildArchitecture: x64
177-
- task: VSBuild@1
178-
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln 32rel
179-
inputs:
180-
solution: DirectXMesh_Desktop_2022_Win10.sln
181-
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
182-
platform: x86
183-
configuration: Release
184-
msbuildArchitecture: x64
185-
- task: VSBuild@1
186-
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln 64dbg
187-
inputs:
188-
solution: DirectXMesh_Desktop_2022_Win10.sln
189-
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
190-
platform: x64
191-
configuration: Debug
192-
msbuildArchitecture: x64
193-
- task: VSBuild@1
194-
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln 64rel
195-
inputs:
196-
solution: DirectXMesh_Desktop_2022_Win10.sln
197-
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
198-
platform: x64
199-
configuration: Release
200-
msbuildArchitecture: x64
201-
- task: VSBuild@1
202-
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln arm64dbg
203-
inputs:
204-
solution: DirectXMesh_Desktop_2022_Win10.sln
205-
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
206-
platform: ARM64
207-
configuration: Debug
208-
msbuildArchitecture: x64
209-
- task: VSBuild@1
210-
displayName: Build solution DirectXMesh_Desktop_2022_Win10.sln arm64rel
211-
inputs:
212-
solution: DirectXMesh_Desktop_2022_Win10.sln
213-
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
214-
platform: ARM64
215-
configuration: Release
112+
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=$(SpectreMitigation)
113+
platform: '$(BuildPlatform)'
114+
configuration: '$(BuildConfiguration)'
216115
msbuildArchitecture: x64
217116

218117
- job: UWP_BUILD
219118
displayName: 'Universal Windows Platform (UWP)'
220119
timeoutInMinutes: 120
221120
cancelTimeoutInMinutes: 1
121+
strategy:
122+
maxParallel: 3
123+
matrix:
124+
Release_arm64:
125+
BuildPlatform: ARM64
126+
BuildConfiguration: Release
127+
Debug_arm64:
128+
BuildPlatform: ARM64
129+
BuildConfiguration: Debug
130+
Release_x64:
131+
BuildPlatform: x64
132+
BuildConfiguration: Release
133+
Debug_x64:
134+
BuildPlatform: x64
135+
BuildConfiguration: Debug
136+
Release_x86:
137+
BuildPlatform: x86
138+
BuildConfiguration: Release
139+
Debug_x86:
140+
BuildPlatform: x86
141+
BuildConfiguration: Debug
222142
steps:
223143
- checkout: self
224144
clean: true
225145
fetchTags: false
226146
- task: VSBuild@1
227-
displayName: Build solution DirectXMesh_Windows10_2022.sln 32dbg
228-
inputs:
229-
solution: DirectXMesh_Windows10_2022.sln
230-
msbuildArgs: /p:PreferredToolArchitecture=x64
231-
platform: x86
232-
configuration: Debug
233-
msbuildArchitecture: x64
234-
- task: VSBuild@1
235-
displayName: Build solution DirectXMesh_Windows10_2022.sln 32rel
236-
inputs:
237-
solution: DirectXMesh_Windows10_2022.sln
238-
msbuildArgs: /p:PreferredToolArchitecture=x64
239-
platform: x86
240-
configuration: Release
241-
msbuildArchitecture: x64
242-
- task: VSBuild@1
243-
displayName: Build solution DirectXMesh_Windows10_2022.sln 64dbg
244-
inputs:
245-
solution: DirectXMesh_Windows10_2022.sln
246-
msbuildArgs: /p:PreferredToolArchitecture=x64
247-
platform: x64
248-
configuration: Debug
249-
msbuildArchitecture: x64
250-
- task: VSBuild@1
251-
displayName: Build solution DirectXMesh_Windows10_2022.sln 64rel
252-
inputs:
253-
solution: DirectXMesh_Windows10_2022.sln
254-
msbuildArgs: /p:PreferredToolArchitecture=x64
255-
platform: x64
256-
configuration: Release
257-
msbuildArchitecture: x64
258-
- task: VSBuild@1
259-
displayName: Build solution DirectXMesh_Windows10_2022.sln arm64dbg
260-
inputs:
261-
solution: DirectXMesh_Windows10_2022.sln
262-
msbuildArgs: /p:PreferredToolArchitecture=x64
263-
platform: ARM64
264-
configuration: Debug
265-
msbuildArchitecture: x64
266-
- task: VSBuild@1
267-
displayName: Build solution DirectXMesh_Windows10_2022.sln arm64rel
147+
displayName: Build solution DirectXMesh_Windows10_2022.sln
268148
inputs:
269149
solution: DirectXMesh_Windows10_2022.sln
270150
msbuildArgs: /p:PreferredToolArchitecture=x64
271-
platform: ARM64
272-
configuration: Release
151+
platform: '$(BuildPlatform)'
152+
configuration: '$(BuildConfiguration)'
273153
msbuildArchitecture: x64

0 commit comments

Comments
 (0)