Skip to content

Commit 13ff4b3

Browse files
walbournwalbourn
authored
GHA and ADO pipeline updates (#572)
1 parent 7e250ef commit 13ff4b3

15 files changed

Lines changed: 470 additions & 146 deletions

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

Lines changed: 12 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
5555

5656
variables:
5757
Codeql.Enabled: false
58-
VS_GENERATOR: 'Visual Studio 16 2019'
58+
VS_GENERATOR: 'Visual Studio 17 2022'
5959
WIN10_SDK: '10.0.19041.0'
6060
WIN11_SDK: '10.0.22000.0'
6161

6262
pool:
63-
vmImage: windows-2019
63+
vmImage: windows-2022
6464

6565
jobs:
6666
- job: CMAKE_BUILD
@@ -74,7 +74,7 @@ jobs:
7474
inputs:
7575
cwd: '$(Build.SourcesDirectory)'
7676
cmakeArgs: >
77-
-G "$(VS_GENERATOR)" -A x64 -B out
77+
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out
7878
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
7979
-DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON
8080
- task: CMake@1
@@ -92,7 +92,7 @@ jobs:
9292
inputs:
9393
cwd: '$(Build.SourcesDirectory)'
9494
cmakeArgs: >
95-
-G "$(VS_GENERATOR)" -A Win32 -B out2
95+
-G "$(VS_GENERATOR)" -T v142 -A Win32 -B out2
9696
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
9797
-DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON
9898
- task: CMake@1
@@ -110,93 +110,56 @@ jobs:
110110
inputs:
111111
cwd: '$(Build.SourcesDirectory)'
112112
cmakeArgs: >
113-
-G "$(VS_GENERATOR)" -A x64 -B out3
113+
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out3
114114
-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
115115
- task: CMake@1
116116
displayName: 'CMake (UWP): Build x64'
117117
inputs:
118118
cwd: '$(Build.SourcesDirectory)'
119119
cmakeArgs: --build out3 -v
120-
- task: CMake@1
121-
displayName: 'CMake (ClangCl): Config x64'
122-
inputs:
123-
cwd: '$(Build.SourcesDirectory)'
124-
cmakeArgs: >
125-
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
126-
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
127-
-DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON
128-
- task: CMake@1
129-
displayName: 'CMake (ClangCl): Build x64 Debug'
130-
inputs:
131-
cwd: '$(Build.SourcesDirectory)'
132-
cmakeArgs: --build out4 -v --config Debug
133-
- task: CMake@1
134-
displayName: 'CMake (ClangCl): Build x64 Release'
135-
inputs:
136-
cwd: '$(Build.SourcesDirectory)'
137-
cmakeArgs: --build out4 -v --config RelWithDebInfo
138120
- task: CMake@1
139121
displayName: 'CMake (Win10): Config'
140122
inputs:
141123
cwd: '$(Build.SourcesDirectory)'
142124
cmakeArgs: >
143-
-G "$(VS_GENERATOR)" -A x64 -B out5
125+
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out4
144126
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
145127
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
146128
-DBUILD_XAUDIO_WIN10=ON -DBUILD_TOOLS=OFF
147129
- task: CMake@1
148130
displayName: 'CMake (Win10): Build'
149131
inputs:
150132
cwd: '$(Build.SourcesDirectory)'
151-
cmakeArgs: --build out5 -v
152-
- task: CMake@1
153-
displayName: 'CMake (MSVC Spectre): Config x64'
154-
inputs:
155-
cwd: '$(Build.SourcesDirectory)'
156-
cmakeArgs: >
157-
-G "$(VS_GENERATOR)" -A x64 -B out6
158-
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
159-
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
160-
-DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON
161-
- task: CMake@1
162-
displayName: 'CMake (MSVC Spectre): Build x64 Debug'
163-
inputs:
164-
cwd: '$(Build.SourcesDirectory)'
165-
cmakeArgs: --build out6 -v --config Debug
166-
- task: CMake@1
167-
displayName: 'CMake (MSVC Spectre): Build x64 Release'
168-
inputs:
169-
cwd: '$(Build.SourcesDirectory)'
170-
cmakeArgs: --build out6 -v --config RelWithDebInfo
133+
cmakeArgs: --build out4 -v
171134
- task: CMake@1
172135
displayName: 'CMake (NO_WCHAR_T): Config'
173136
inputs:
174137
cwd: '$(Build.SourcesDirectory)'
175138
cmakeArgs: >
176-
-G "$(VS_GENERATOR)" -A x64 -B out7
139+
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out5
177140
-DNO_WCHAR_T=ON
178141
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)'
179142
- task: CMake@1
180143
displayName: 'CMake (NO_WCHAR_T): Build'
181144
inputs:
182145
cwd: '$(Build.SourcesDirectory)'
183-
cmakeArgs: --build out7 -v --config Debug
146+
cmakeArgs: --build out5 -v --config Debug
184147
- task: CMake@1
185148
displayName: 'CMake (DLL): Config x64'
186149
inputs:
187150
cwd: '$(Build.SourcesDirectory)'
188151
cmakeArgs: >
189-
-G "$(VS_GENERATOR)" -A x64 -B out8
152+
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out6
190153
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
191154
-DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON
192155
-DBUILD_SHARED_LIBS=ON
193156
- task: CMake@1
194157
displayName: 'CMake (DLL): Build x64 Debug'
195158
inputs:
196159
cwd: '$(Build.SourcesDirectory)'
197-
cmakeArgs: --build out8 -v --config Debug
160+
cmakeArgs: --build out6 -v --config Debug
198161
- task: CMake@1
199162
displayName: 'CMake (DLL): Build x64 Release'
200163
inputs:
201164
cwd: '$(Build.SourcesDirectory)'
202-
cmakeArgs: --build out8 -v --config RelWithDebInfo
165+
cmakeArgs: --build out6 -v --config RelWithDebInfo

‎.azuredevops/pipelines/DirectXTK-GitHub-GDK-Dev17.yml‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ variables:
4444
value: false
4545
- name: EXTRACTED_FOLDER
4646
value: '$(ExtractedFolder)'
47+
- name: GDK_EDITION
48+
value: $(GDKEditionNumber)
4749
- name: GDKEnableBWOI
4850
value: true
4951
- name: URL_FEED
@@ -56,6 +58,8 @@ variables:
5658
jobs:
5759
- job: BUILD_GDK
5860
displayName: 'Microsoft Game Development Kit (GDK)'
61+
workspace:
62+
clean: all
5963
timeoutInMinutes: 120
6064
cancelTimeoutInMinutes: 1
6165
steps:
@@ -90,11 +94,13 @@ jobs:
9094
displayName: 'Secure Supply Chain Analysis'
9195
- task: NuGetAuthenticate@1
9296
displayName: 'NuGet Auth'
93-
- task: NuGetCommand@2
94-
displayName: NuGet install PGDK
97+
- task: PowerShell@2
98+
displayName: 'NuGet Install GDK'
9599
inputs:
96-
command: custom
97-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
100+
targetType: filePath
101+
filePath: ./build/RestoreGDK.ps1
102+
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
103+
failOnStderr: true
98104
- task: CopyFiles@2
99105
displayName: Set up Directory.Build.props
100106
inputs:
@@ -105,15 +111,13 @@ jobs:
105111
displayName: Setup BWOI VCTargets
106112
inputs:
107113
solution: build/SetupBWOI.targets
108-
msbuildVersion: 17.0
109114
msbuildArchitecture: x64
110115
msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
111116
- task: VSBuild@1
112117
displayName: Build solution DirectXTK_GDK_2022 pcdbg
113118
continueOnError: true
114119
inputs:
115120
solution: DirectXTK_GDK_2022.sln
116-
vsVersion: 17.0
117121
platform: Gaming.Desktop.x64
118122
configuration: Debug
119123
msbuildArchitecture: x64
@@ -123,14 +127,15 @@ jobs:
123127
continueOnError: true
124128
inputs:
125129
solution: DirectXTK_GDK_2022.sln
126-
vsVersion: 17.0
127130
platform: Gaming.Desktop.x64
128131
configuration: Release
129132
msbuildArchitecture: x64
130133
msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
131134

132135
- job: BUILD_GDK_CMAKE
133136
displayName: 'Microsoft Game Development Kit (GDK) using CMake'
137+
workspace:
138+
clean: all
134139
timeoutInMinutes: 120
135140
cancelTimeoutInMinutes: 1
136141
steps:
@@ -164,11 +169,13 @@ jobs:
164169
displayName: 'Secure Supply Chain Analysis'
165170
- task: NuGetAuthenticate@1
166171
displayName: 'NuGet Auth'
167-
- task: NuGetCommand@2
168-
displayName: NuGet install PGDK
172+
- task: PowerShell@2
173+
displayName: 'NuGet Install GDK'
169174
inputs:
170-
command: custom
171-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
175+
targetType: filePath
176+
filePath: ./build/RestoreGDK.ps1
177+
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
178+
failOnStderr: true
172179
- task: CmdLine@2
173180
displayName: Setup BWOI for GDK command-line
174181
inputs:

‎.azuredevops/pipelines/DirectXTK-GitHub-GDK.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,16 @@ resources:
6363
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
6464

6565
pool:
66-
vmImage: windows-2019
66+
vmImage: windows-2022
6767

6868
variables:
6969
- group: dxtk-shared-variables
7070
- name: Codeql.Enabled
7171
value: false
7272
- name: EXTRACTED_FOLDER
7373
value: '$(ExtractedFolder)'
74+
- name: GDK_EDITION
75+
value: $(GDKEditionNumber)
7476
- name: GDKEnableBWOI
7577
value: true
7678
- name: URL_FEED
@@ -81,6 +83,8 @@ variables:
8183
jobs:
8284
- job: BUILD_GDK
8385
displayName: 'Microsoft Game Development Kit (GDK)'
86+
workspace:
87+
clean: all
8488
timeoutInMinutes: 120
8589
cancelTimeoutInMinutes: 1
8690
steps:
@@ -115,11 +119,13 @@ jobs:
115119
displayName: 'Secure Supply Chain Analysis'
116120
- task: NuGetAuthenticate@1
117121
displayName: 'NuGet Auth'
118-
- task: NuGetCommand@2
119-
displayName: NuGet install PGDK
122+
- task: PowerShell@2
123+
displayName: 'NuGet Install GDK'
120124
inputs:
121-
command: custom
122-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
125+
targetType: filePath
126+
filePath: ./build/RestoreGDK.ps1
127+
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
128+
failOnStderr: true
123129
- task: CopyFiles@2
124130
displayName: Set up Directory.Build.props
125131
inputs:
@@ -130,15 +136,13 @@ jobs:
130136
displayName: Setup BWOI VCTargets
131137
inputs:
132138
solution: build/SetupBWOI.targets
133-
msbuildVersion: 16.0
134139
msbuildArchitecture: x64
135140
msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
136141
- task: VSBuild@1
137142
displayName: Build solution DirectXTK_GDK_2019 pcdbg
138143
continueOnError: true
139144
inputs:
140145
solution: DirectXTK_GDK_2019.sln
141-
vsVersion: 16.0
142146
platform: Gaming.Desktop.x64
143147
configuration: Debug
144148
msbuildArchitecture: x64
@@ -148,14 +152,15 @@ jobs:
148152
continueOnError: true
149153
inputs:
150154
solution: DirectXTK_GDK_2019.sln
151-
vsVersion: 16.0
152155
platform: Gaming.Desktop.x64
153156
configuration: Release
154157
msbuildArchitecture: x64
155158
msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
156159

157160
- job: BUILD_TESTS_GDK
158161
displayName: 'Test Suite for Microsoft Game Development Kit (GDK)'
162+
workspace:
163+
clean: all
159164
timeoutInMinutes: 120
160165
cancelTimeoutInMinutes: 1
161166
steps:
@@ -196,11 +201,13 @@ jobs:
196201
displayName: 'Secure Supply Chain Analysis'
197202
- task: NuGetAuthenticate@1
198203
displayName: 'NuGet Auth'
199-
- task: NuGetCommand@2
200-
displayName: NuGet install PGDK
204+
- task: PowerShell@2
205+
displayName: 'NuGet Install GDK'
201206
inputs:
202-
command: custom
203-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
207+
targetType: filePath
208+
filePath: ./build/RestoreGDK.ps1
209+
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
210+
failOnStderr: true
204211
- task: CopyFiles@2
205212
displayName: Set up Directory.Build.props
206213
inputs:
@@ -211,14 +218,12 @@ jobs:
211218
displayName: Setup BWOI VCTargets
212219
inputs:
213220
solution: build/SetupBWOI.targets
214-
msbuildVersion: 16.0
215221
msbuildArchitecture: x64
216222
msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
217223
- task: VSBuild@1
218224
displayName: Build Tests pcdbg
219225
inputs:
220226
solution: '**\*GDK_2019*.sln'
221-
vsVersion: 16.0
222227
platform: Gaming.Desktop.x64
223228
configuration: Debug
224229
msbuildArchitecture: x64
@@ -227,7 +232,6 @@ jobs:
227232
displayName: Build Tests pcrel
228233
inputs:
229234
solution: '**\*GDK_2019*.sln'
230-
vsVersion: 16.0
231235
platform: Gaming.Desktop.x64
232236
configuration: Release
233237
msbuildArchitecture: x64

‎.azuredevops/pipelines/DirectXTK-GitHub-Test-Dev17.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ resources:
2727
- repository: self
2828
type: git
2929
ref: refs/heads/main
30-
trigger: none
3130
- repository: testRepo
3231
name: walbourn/directxtktest
3332
type: github
@@ -92,7 +91,6 @@ jobs:
9291
displayName: Build solution DirectXTK_Tests_Desktop_2022.sln
9392
inputs:
9493
solution: Tests/DirectXTK_Tests_Desktop_2022.sln
95-
vsVersion: 17.0
9694
msbuildArgs: /p:PreferredToolArchitecture=x64
9795
platform: '$(BuildPlatform)'
9896
configuration: '$(BuildConfiguration)'
@@ -102,7 +100,6 @@ jobs:
102100
displayName: Build solution DirectXTK_Tests_Desktop_2022_Win10.sln
103101
inputs:
104102
solution: Tests/DirectXTK_Tests_Desktop_2022_Win10.sln
105-
vsVersion: 17.0
106103
msbuildArgs: /p:PreferredToolArchitecture=x64
107104
platform: '$(BuildPlatform)'
108105
configuration: '$(BuildConfiguration)'
@@ -149,7 +146,6 @@ jobs:
149146
displayName: Build solution DirectXTK_Tests_Windows10.sln
150147
inputs:
151148
solution: Tests/DirectXTK_Tests_Windows10.sln
152-
vsVersion: 17.0
153149
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:AppxBundle=Never
154150
platform: '$(BuildPlatform)'
155151
configuration: '$(BuildConfiguration)'

0 commit comments

Comments
 (0)