Skip to content

Commit 6802e35

Browse files
walbournwalbourn
authored
GHA and ADO pipeline updates (#257)
1 parent 9544446 commit 6802e35

File tree

10 files changed

+228
-187
lines changed

10 files changed

+228
-187
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# http://go.microsoft.com/fwlink/?LinkID=615560
55

6-
# Builds the library and test suite using CMake with VS Generator (GitHub Actions covers Ninja)
6+
# Builds the library and test suite using CMake using VS Generator (GitHub Actions covers Ninja)
77

88
schedules:
99
- cron: "0 0 * * *"
@@ -30,7 +30,6 @@ resources:
3030
- repository: self
3131
type: git
3232
ref: refs/heads/main
33-
trigger: none
3433
- repository: testRepo
3534
name: walbourn/directxmathtest
3635
type: github

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

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
5050

5151
variables:
5252
Codeql.Enabled: false
53-
VS_GENERATOR: 'Visual Studio 16 2019'
53+
VS_GENERATOR: 'Visual Studio 17 2022'
5454
WIN10_SDK: '10.0.19041.0'
5555

5656
pool:
57-
vmImage: windows-2019
57+
vmImage: windows-2022
5858

5959
jobs:
6060
- job: CMAKE_BUILD
@@ -77,7 +77,7 @@ jobs:
7777
inputs:
7878
cwd: '$(Build.SourcesDirectory)'
7979
cmakeArgs: >
80-
-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
80+
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
8181
- task: CMake@1
8282
displayName: CMake (Build x64)
8383
inputs:
@@ -88,7 +88,7 @@ jobs:
8888
inputs:
8989
cwd: Tests
9090
cmakeArgs: >
91-
-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
91+
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
9292
- task: CMake@1
9393
displayName: CMake Test (Build x64)
9494
inputs:
@@ -99,7 +99,7 @@ jobs:
9999
inputs:
100100
cwd: '$(Build.SourcesDirectory)'
101101
cmakeArgs: >
102-
-G "$(VS_GENERATOR)" -A ARM64 -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
102+
-G "$(VS_GENERATOR)" -T v142 -A ARM64 -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
103103
- task: CMake@1
104104
displayName: CMake (Build ARM64)
105105
inputs:
@@ -110,31 +110,9 @@ jobs:
110110
inputs:
111111
cwd: Tests
112112
cmakeArgs: >
113-
-G "$(VS_GENERATOR)" -A ARM64 -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
113+
-G "$(VS_GENERATOR)" -T v142 -A ARM64 -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
114114
- task: CMake@1
115115
displayName: CMake Test (Build ARM64)
116116
inputs:
117117
cwd: Tests
118118
cmakeArgs: --build out2 -v
119-
- task: CMake@1
120-
displayName: CMake (ClangCl)
121-
inputs:
122-
cwd: '$(Build.SourcesDirectory)'
123-
cmakeArgs: >
124-
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
125-
- task: CMake@1
126-
displayName: CMake (Build)
127-
inputs:
128-
cwd: '$(Build.SourcesDirectory)'
129-
cmakeArgs: --build out3 -v
130-
- task: CMake@1
131-
displayName: CMake Test (ClangCL)
132-
inputs:
133-
cwd: Tests
134-
cmakeArgs: >
135-
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
136-
- task: CMake@1
137-
displayName: CMake Test (Build)
138-
inputs:
139-
cwd: Tests
140-
cmakeArgs: --build out3 -v

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ jobs:
6767
Debug_x86:
6868
BuildPlatform: x86
6969
BuildConfiguration: Debug
70-
7170
steps:
7271
- checkout: self
7372
clean: true
@@ -84,23 +83,20 @@ jobs:
8483
displayName: Build solution math3_2022.sln
8584
inputs:
8685
solution: Tests/math3/math3_2022.sln
87-
vsVersion: 17.0
8886
platform: '$(BuildPlatform)'
8987
configuration: '$(BuildConfiguration)'
9088
msbuildArchitecture: x64
9189
- task: VSBuild@1
9290
displayName: Build solution math3_2022.sln no-intrinsics
9391
inputs:
9492
solution: Tests/math3/math3_2022.sln
95-
vsVersion: 17.0
9693
platform: '$(BuildPlatform)'
9794
configuration: 'NI $(BuildConfiguration)'
9895
msbuildArchitecture: x64
9996
- task: VSBuild@1
10097
displayName: Build solution math3_2022.sln SSE3
10198
inputs:
10299
solution: Tests/math3/math3_2022.sln
103-
vsVersion: 17.0
104100
platform: '$(BuildPlatform)'
105101
configuration: 'SSE3 $(BuildConfiguration)'
106102
msbuildArchitecture: x64
@@ -109,7 +105,6 @@ jobs:
109105
displayName: Build solution math3_2022.sln SSE4
110106
inputs:
111107
solution: Tests/math3/math3_2022.sln
112-
vsVersion: 17.0
113108
platform: '$(BuildPlatform)'
114109
configuration: 'SSE4 $(BuildConfiguration)'
115110
msbuildArchitecture: x64
@@ -118,7 +113,6 @@ jobs:
118113
displayName: Build solution math3_2022.sln AVX
119114
inputs:
120115
solution: Tests/math3/math3_2022.sln
121-
vsVersion: 17.0
122116
platform: '$(BuildPlatform)'
123117
configuration: 'AVX $(BuildConfiguration)'
124118
msbuildArchitecture: x64
@@ -127,7 +121,6 @@ jobs:
127121
displayName: Build solution math3_2022.sln AVX2
128122
inputs:
129123
solution: Tests/math3/math3_2022.sln
130-
vsVersion: 17.0
131124
platform: '$(BuildPlatform)'
132125
configuration: 'AVX2 $(BuildConfiguration)'
133126
msbuildArchitecture: x64
@@ -136,7 +129,6 @@ jobs:
136129
displayName: Build solution math3_2022.sln x87
137130
inputs:
138131
solution: Tests/math3/math3_2022.sln
139-
vsVersion: 17.0
140132
platform: '$(BuildPlatform)'
141133
configuration: 'x87 $(BuildConfiguration)'
142134
msbuildArchitecture: x64
@@ -182,15 +174,13 @@ jobs:
182174
displayName: Build solution shmath_2022.sln
183175
inputs:
184176
solution: Tests/shmath/shmath_2022.sln
185-
vsVersion: 17.0
186177
platform: '$(BuildPlatform)'
187178
configuration: '$(BuildConfiguration)'
188179
msbuildArchitecture: x64
189180
- task: VSBuild@1
190181
displayName: Build solution XDSPTest_2022
191182
inputs:
192183
solution: Tests/xdsp/XDSPTest_2022.sln
193-
vsVersion: 17.0
194184
platform: '$(BuildPlatform)'
195185
configuration: '$(BuildConfiguration)'
196186
msbuildArchitecture: x64

‎.azuredevops/pipelines/DirectXMath-GitHub.yml

Lines changed: 1 addition & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ resources:
3636
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
3737

3838
pool:
39-
vmImage: windows-2019
39+
vmImage: windows-2022
4040

4141
variables:
4242
Codeql.Enabled: true
@@ -76,49 +76,42 @@ jobs:
7676
displayName: Build solution math3_2019.sln
7777
inputs:
7878
solution: Tests/math3/math3_2019.sln
79-
vsVersion: 16.0
8079
platform: '$(BuildPlatform)'
8180
configuration: '$(BuildConfiguration)'
8281
- task: VSBuild@1
8382
displayName: Build solution math3_2019.sln no-intrinsics
8483
inputs:
8584
solution: Tests/math3/math3_2019.sln
86-
vsVersion: 16.0
8785
platform: '$(BuildPlatform)'
8886
configuration: 'NI $(BuildConfiguration)'
8987
- task: VSBuild@1
9088
displayName: Build solution math3_2019.sln SSE3
9189
inputs:
9290
solution: Tests/math3/math3_2019.sln
93-
vsVersion: 16.0
9491
platform: '$(BuildPlatform)'
9592
configuration: 'SSE3 $(BuildConfiguration)'
9693
- task: VSBuild@1
9794
displayName: Build solution math3_2019.sln SSE4
9895
inputs:
9996
solution: Tests/math3/math3_2019.sln
100-
vsVersion: 16.0
10197
platform: '$(BuildPlatform)'
10298
configuration: 'SSE4 $(BuildConfiguration)'
10399
- task: VSBuild@1
104100
displayName: Build solution math3_2019.sln AVX
105101
inputs:
106102
solution: Tests/math3/math3_2019.sln
107-
vsVersion: 16.0
108103
platform: '$(BuildPlatform)'
109104
configuration: 'AVX $(BuildConfiguration)'
110105
- task: VSBuild@1
111106
displayName: Build solution math3_2019.sln AVX2
112107
inputs:
113108
solution: Tests/math3/math3_2019.sln
114-
vsVersion: 16.0
115109
platform: '$(BuildPlatform)'
116110
configuration: 'AVX2 $(BuildConfiguration)'
117111
- task: VSBuild@1
118112
displayName: Build solution math3_2019.sln x87
119113
inputs:
120114
solution: Tests/math3/math3_2019.sln
121-
vsVersion: 16.0
122115
platform: '$(BuildPlatform)'
123116
configuration: 'x87 $(BuildConfiguration)'
124117
condition: eq(variables['BuildPlatform'], 'x86')
@@ -157,138 +150,11 @@ jobs:
157150
displayName: Build solution shmath_2019.sln
158151
inputs:
159152
solution: Tests/shmath/shmath_2019.sln
160-
vsVersion: 16.0
161153
platform: '$(BuildPlatform)'
162154
configuration: '$(BuildConfiguration)'
163155
- task: VSBuild@1
164156
displayName: Build solution XDSPTest_2019
165157
inputs:
166158
solution: Tests/xdsp/XDSPTest_2019.sln
167-
vsVersion: 16.0
168-
platform: '$(BuildPlatform)'
169-
configuration: '$(BuildConfiguration)'
170-
171-
- job: BUILD_LEGACY
172-
displayName: 'Visual Studio 2019 (v141) Legacy'
173-
strategy:
174-
maxParallel: 4
175-
matrix:
176-
Release_x64:
177-
BuildPlatform: x64
178-
BuildConfiguration: Release
179-
Debug_x64:
180-
BuildPlatform: x64
181-
BuildConfiguration: Debug
182-
Release_x86:
183-
BuildPlatform: x86
184-
BuildConfiguration: Release
185-
Debug_x86:
186-
BuildPlatform: x86
187-
BuildConfiguration: Debug
188-
steps:
189-
- checkout: self
190-
clean: true
191-
fetchTags: false
192-
fetchDepth: 1
193-
path: 's'
194-
- checkout: testRepo
195-
displayName: Fetch Tests
196-
clean: true
197-
fetchTags: false
198-
fetchDepth: 1
199-
path: 's/Tests'
200-
- task: VSBuild@1
201-
displayName: Build solution math3_2017.sln
202-
inputs:
203-
solution: Tests/math3/math3_2017.sln
204-
vsVersion: 16.0
205-
platform: '$(BuildPlatform)'
206-
configuration: '$(BuildConfiguration)'
207-
- task: VSBuild@1
208-
displayName: Build solution math3_2017.sln no-intrinsics
209-
inputs:
210-
solution: Tests/math3/math3_2017.sln
211-
vsVersion: 16.0
212-
platform: '$(BuildPlatform)'
213-
configuration: 'NI $(BuildConfiguration)'
214-
- task: VSBuild@1
215-
displayName: Build solution math3_2017.sln SSE3
216-
inputs:
217-
solution: Tests/math3/math3_2017.sln
218-
vsVersion: 16.0
219-
platform: '$(BuildPlatform)'
220-
configuration: 'SSE3 $(BuildConfiguration)'
221-
- task: VSBuild@1
222-
displayName: Build solution math3_2017.sln SSE4
223-
inputs:
224-
solution: Tests/math3/math3_2017.sln
225-
vsVersion: 16.0
226-
platform: '$(BuildPlatform)'
227-
configuration: 'SSE4 $(BuildConfiguration)'
228-
- task: VSBuild@1
229-
displayName: Build solution math3_2017.sln AVX
230-
inputs:
231-
solution: Tests/math3/math3_2017.sln
232-
vsVersion: 16.0
233-
platform: '$(BuildPlatform)'
234-
configuration: 'AVX $(BuildConfiguration)'
235-
- task: VSBuild@1
236-
displayName: Build solution math3_2017.sln AVX2
237-
inputs:
238-
solution: Tests/math3/math3_2017.sln
239-
vsVersion: 16.0
240-
platform: '$(BuildPlatform)'
241-
configuration: 'AVX2 $(BuildConfiguration)'
242-
- task: VSBuild@1
243-
displayName: Build solution math3_2017.sln x86dbg x87
244-
inputs:
245-
solution: Tests/math3/math3_2017.sln
246-
vsVersion: 16.0
247-
platform: '$(BuildPlatform)'
248-
configuration: 'x87 $(BuildConfiguration)'
249-
condition: eq(variables['BuildPlatform'], 'x86')
250-
251-
- job: BUILD_EXTS_LEGACY
252-
displayName: 'Visual Studio 2019 (v141) Legacy - SHMath and XDSP'
253-
cancelTimeoutInMinutes: 1
254-
strategy:
255-
maxParallel: 1
256-
matrix:
257-
Release_x64:
258-
BuildPlatform: x64
259-
BuildConfiguration: Release
260-
Debug_x64:
261-
BuildPlatform: x64
262-
BuildConfiguration: Debug
263-
Release_x86:
264-
BuildPlatform: x86
265-
BuildConfiguration: Release
266-
Debug_x86:
267-
BuildPlatform: x86
268-
BuildConfiguration: Debug
269-
steps:
270-
- checkout: self
271-
clean: true
272-
fetchTags: false
273-
fetchDepth: 1
274-
path: 's'
275-
- checkout: testRepo
276-
displayName: Fetch Tests
277-
clean: true
278-
fetchTags: false
279-
fetchDepth: 1
280-
path: 's/Tests'
281-
- task: VSBuild@1
282-
displayName: Build solution shmath_2017.sln
283-
inputs:
284-
solution: Tests/shmath/shmath_2017.sln
285-
vsVersion: 16.0
286-
platform: '$(BuildPlatform)'
287-
configuration: '$(BuildConfiguration)'
288-
- task: VSBuild@1
289-
displayName: Build solution XDSPTest_2017
290-
inputs:
291-
solution: Tests/xdsp/XDSPTest_2017.sln
292-
vsVersion: 16.0
293159
platform: '$(BuildPlatform)'
294160
configuration: '$(BuildConfiguration)'

0 commit comments

Comments
 (0)