Skip to content

Commit 169f7cf

Browse files
walbournwalbourn
authored
Cleanup of ADO pipeline YAML files (#615)
1 parent 652cc82 commit 169f7cf

29 files changed

+896
-940
lines changed

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

‎.azuredevops/pipelines/DirectXTex-GitHub-CMake-Xbox-Dev17.yml

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ resources:
3333
type: git
3434
ref: refs/heads/main
3535
trigger: none
36+
- repository: testRepo
37+
name: walbourn/directxtextest
38+
type: github
39+
endpoint: microsoft
40+
ref: refs/heads/main
3641

3742
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
3843

@@ -48,6 +53,8 @@ variables:
4853
value: '$(ExtractedFolder)'
4954
- name: URL_FEED
5055
value: $(ADOFeedURL)
56+
- name: VC_PATH
57+
value: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
5158
- name: GameDKLatest
5259
value: '$(ExtractedFolder)\Microsoft.gdk.xbox.$(GDK_EDITION)\native\$(GDK_EDITION)\'
5360
- name: skipNugetSecurityAnalysis
@@ -198,3 +205,191 @@ jobs:
198205
inputs:
199206
cwd: ''
200207
cmakeArgs: --build out6 -v --config Debug
208+
209+
- job: BUILD_GDK_CMAKE_XS
210+
displayName: 'Xbox Series X|S Extensions BUILD_TESTING=ON'
211+
timeoutInMinutes: 120
212+
cancelTimeoutInMinutes: 1
213+
steps:
214+
- checkout: self
215+
clean: true
216+
fetchTags: false
217+
fetchDepth: 1
218+
path: 's'
219+
- checkout: testRepo
220+
displayName: Fetch Tests
221+
clean: true
222+
fetchTags: false
223+
fetchDepth: 1
224+
path: 's/Tests'
225+
- task: NuGetToolInstaller@1
226+
displayName: 'Use NuGet'
227+
- task: PowerShell@2
228+
displayName: 'Create nuget.config with single source'
229+
inputs:
230+
targetType: inline
231+
script: |
232+
$xml = @'
233+
<?xml version="1.0" encoding="utf-8"?>
234+
<configuration>
235+
<packageSources>
236+
<clear />
237+
</packageSources>
238+
</configuration>
239+
'@
240+
$xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
241+
242+
- task: NuGetCommand@2
243+
# We have to use a nuget.config to provide the feed for the 'nuget install' option.
244+
displayName: 'NuGet set package source to ADO feed'
245+
inputs:
246+
command: custom
247+
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
248+
- task: nuget-security-analysis@0
249+
displayName: 'Secure Supply Chain Analysis'
250+
- task: NuGetAuthenticate@1
251+
displayName: 'NuGet Auth'
252+
- task: NuGetCommand@2
253+
displayName: NuGet install PGDK
254+
inputs:
255+
command: custom
256+
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
257+
- task: NuGetCommand@2
258+
displayName: NuGet install GDKX
259+
inputs:
260+
command: custom
261+
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
262+
- task: CmdLine@2
263+
displayName: Setup BWOI for GDK command-line
264+
inputs:
265+
script: |
266+
call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
267+
echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
268+
echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
269+
echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
270+
echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
271+
echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
272+
echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
273+
call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) Scarlett
274+
echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
275+
echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
276+
echo ##vso[task.setvariable variable=GXDKLatest;]%GXDKLatest%
277+
echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
278+
echo ##vso[task.setvariable variable=LIB;]%LIB%
279+
echo ##vso[task.prependpath]%ADDBIN%
280+
281+
failOnStderr: true
282+
- task: CMake@1
283+
displayName: 'CMake (MSVC): Config Debug'
284+
inputs:
285+
cwd: '$(Build.SourcesDirectory)'
286+
cmakeArgs: --preset=x64-Debug-GDKX-S
287+
- task: CMake@1
288+
displayName: 'CMake (MSVC): Build Debug'
289+
inputs:
290+
cwd: '$(Build.SourcesDirectory)'
291+
cmakeArgs: --build out\build\x64-Debug-GDKX-S
292+
- task: CMake@1
293+
displayName: 'CMake (MSVC): Config Release'
294+
inputs:
295+
cwd: '$(Build.SourcesDirectory)'
296+
cmakeArgs: --preset=x64-Release-GDKX-S
297+
- task: CMake@1
298+
displayName: 'CMake (MSVC): Build Release'
299+
inputs:
300+
cwd: '$(Build.SourcesDirectory)'
301+
cmakeArgs: --build out\build\x64-Release-GDKX-S
302+
303+
- job: BUILD_GDK_CMAKE_X
304+
displayName: 'Xbox One Extensions BUILD_TESTING=ON'
305+
timeoutInMinutes: 120
306+
cancelTimeoutInMinutes: 1
307+
steps:
308+
- checkout: self
309+
clean: true
310+
fetchTags: false
311+
fetchDepth: 1
312+
path: 's'
313+
- checkout: testRepo
314+
displayName: Fetch Tests
315+
clean: true
316+
fetchTags: false
317+
fetchDepth: 1
318+
path: 's/Tests'
319+
- task: NuGetToolInstaller@1
320+
displayName: 'Use NuGet'
321+
- task: PowerShell@2
322+
displayName: 'Create nuget.config with single source'
323+
inputs:
324+
targetType: inline
325+
script: |
326+
$xml = @'
327+
<?xml version="1.0" encoding="utf-8"?>
328+
<configuration>
329+
<packageSources>
330+
<clear />
331+
</packageSources>
332+
</configuration>
333+
'@
334+
$xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
335+
336+
- task: NuGetCommand@2
337+
# We have to use a nuget.config to provide the feed for the 'nuget install' option.
338+
displayName: 'NuGet set package source to ADO feed'
339+
inputs:
340+
command: custom
341+
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
342+
- task: nuget-security-analysis@0
343+
displayName: 'Secure Supply Chain Analysis'
344+
- task: NuGetAuthenticate@1
345+
displayName: 'NuGet Auth'
346+
- task: NuGetCommand@2
347+
displayName: NuGet install PGDK
348+
inputs:
349+
command: custom
350+
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
351+
- task: NuGetCommand@2
352+
displayName: NuGet install GDKX
353+
inputs:
354+
command: custom
355+
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
356+
- task: CmdLine@2
357+
displayName: Setup BWOI for GDK command-line
358+
inputs:
359+
script: |
360+
call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
361+
echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
362+
echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
363+
echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
364+
echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
365+
echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
366+
echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
367+
call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) XboxOne
368+
echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
369+
echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
370+
echo ##vso[task.setvariable variable=GXDKLatest;]%GXDKLatest%
371+
echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
372+
echo ##vso[task.setvariable variable=LIB;]%LIB%
373+
echo ##vso[task.prependpath]%ADDBIN%
374+
375+
failOnStderr: true
376+
- task: CMake@1
377+
displayName: 'CMake (MSVC): Config Debug'
378+
inputs:
379+
cwd: '$(Build.SourcesDirectory)'
380+
cmakeArgs: --preset=x64-Debug-GDKX
381+
- task: CMake@1
382+
displayName: 'CMake (MSVC): Build Debug'
383+
inputs:
384+
cwd: '$(Build.SourcesDirectory)'
385+
cmakeArgs: --build out\build\x64-Debug-GDKX
386+
- task: CMake@1
387+
displayName: 'CMake (MSVC): Config Release'
388+
inputs:
389+
cwd: '$(Build.SourcesDirectory)'
390+
cmakeArgs: --preset=x64-Release-GDKX
391+
- task: CMake@1
392+
displayName: 'CMake (MSVC): Build Release'
393+
inputs:
394+
cwd: '$(Build.SourcesDirectory)'
395+
cmakeArgs: --build out\build\x64-Release-GDKX

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

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

0 commit comments

Comments
 (0)