Skip to content

Commit 02108eb

Browse files
walbournwalbourn
authored
GHA and ADO pipeline updates (#234)
1 parent bf77fd3 commit 02108eb

17 files changed

+496
-210
lines changed

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

Lines changed: 10 additions & 60 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_DX12=OFF
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_DX12=OFF
9898
- task: CMake@1
@@ -110,92 +110,42 @@ 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-
- task: CMake@1
128-
displayName: 'CMake (ClangCl): Build x64 Debug'
129-
inputs:
130-
cwd: '$(Build.SourcesDirectory)'
131-
cmakeArgs: --build out4 -v --config Debug
132-
- task: CMake@1
133-
displayName: 'CMake (ClangCl): Build x64 Release'
134-
inputs:
135-
cwd: '$(Build.SourcesDirectory)'
136-
cmakeArgs: --build out4 -v --config RelWithDebInfo
137120
- task: CMake@1
138121
displayName: 'CMake (Win10): Config'
139122
inputs:
140123
cwd: '$(Build.SourcesDirectory)'
141124
cmakeArgs: >
142-
-G "$(VS_GENERATOR)" -A x64 -B out5
125+
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out4
143126
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
144127
-DBUILD_DX12=ON
145128
- task: CMake@1
146129
displayName: 'CMake (Win10): Build'
147130
inputs:
148131
cwd: '$(Build.SourcesDirectory)'
149-
cmakeArgs: --build out5 -v --config Debug
150-
- task: CMake@1
151-
displayName: 'CMake (MSVC Spectre): Config x64'
152-
inputs:
153-
cwd: '$(Build.SourcesDirectory)'
154-
cmakeArgs: >
155-
-G "$(VS_GENERATOR)" -A x64 -B out6
156-
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
157-
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
158-
-DBUILD_DX12=OFF
159-
- task: CMake@1
160-
displayName: 'CMake (MSVC Spectre): Build x64 Debug'
161-
inputs:
162-
cwd: '$(Build.SourcesDirectory)'
163-
cmakeArgs: --build out6 -v --config Debug
164-
- task: CMake@1
165-
displayName: 'CMake (MSVC Spectre): Build x64 Release'
166-
inputs:
167-
cwd: '$(Build.SourcesDirectory)'
168-
cmakeArgs: --build out6 -v --config RelWithDebInfo
169-
- task: CMake@1
170-
displayName: 'CMake (Win10 Spectre): Config'
171-
inputs:
172-
cwd: '$(Build.SourcesDirectory)'
173-
cmakeArgs: >
174-
-G "$(VS_GENERATOR)" -A x64 -B out7
175-
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
176-
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
177-
-DBUILD_DX12=ON
178-
- task: CMake@1
179-
displayName: 'CMake (Win10 Spectre): Build'
180-
inputs:
181-
cwd: '$(Build.SourcesDirectory)'
182-
cmakeArgs: --build out7 -v --config Debug
132+
cmakeArgs: --build out4 -v --config Debug
183133
- task: CMake@1
184134
displayName: 'CMake (DLL): Config x64'
185135
inputs:
186136
cwd: '$(Build.SourcesDirectory)'
187137
cmakeArgs: >
188-
-G "$(VS_GENERATOR)" -A x64 -B out8
138+
-G "$(VS_GENERATOR)" -T v142 -A x64 -B out5
189139
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
190140
-DBUILD_DX12=ON
191141
-DBUILD_SHARED_LIBS=ON
192142
- task: CMake@1
193143
displayName: 'CMake (DLL): Build x64 Debug'
194144
inputs:
195145
cwd: '$(Build.SourcesDirectory)'
196-
cmakeArgs: --build out8 -v --config Debug
146+
cmakeArgs: --build out5 -v --config Debug
197147
- task: CMake@1
198148
displayName: 'CMake (DLL): Build x64 Release'
199149
inputs:
200150
cwd: '$(Build.SourcesDirectory)'
201-
cmakeArgs: --build out8 -v --config RelWithDebInfo
151+
cmakeArgs: --build out5 -v --config RelWithDebInfo

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

Lines changed: 20 additions & 28 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
@@ -89,16 +91,13 @@ jobs:
8991
displayName: 'Secure Supply Chain Analysis'
9092
- task: NuGetAuthenticate@1
9193
displayName: 'NuGet Auth'
92-
- task: NuGetCommand@2
93-
displayName: NuGet install PGDK
94-
inputs:
95-
command: custom
96-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
97-
- task: NuGetCommand@2
98-
displayName: NuGet install GDKX
94+
- task: PowerShell@2
95+
displayName: 'NuGet Install GDK'
9996
inputs:
100-
command: custom
101-
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
97+
targetType: filePath
98+
filePath: ./build/RestoreGDK.ps1
99+
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
100+
failOnStderr: true
102101
- task: CopyFiles@2
103102
displayName: Set up Directory.Build.props
104103
inputs:
@@ -109,7 +108,6 @@ jobs:
109108
displayName: Setup BWOI VCTargets
110109
inputs:
111110
solution: build/SetupBWOI.targets
112-
msbuildVersion: 17.0
113111
msbuildArchitecture: x64
114112
msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
115113
- template: '/.azuredevops/templates/DirectXMesh-build-gdk.yml'
@@ -152,16 +150,13 @@ jobs:
152150
displayName: 'Secure Supply Chain Analysis'
153151
- task: NuGetAuthenticate@1
154152
displayName: 'NuGet Auth'
155-
- task: NuGetCommand@2
156-
displayName: NuGet install PGDK
157-
inputs:
158-
command: custom
159-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
160-
- task: NuGetCommand@2
161-
displayName: NuGet install GDKX
153+
- task: PowerShell@2
154+
displayName: 'NuGet Install GDK'
162155
inputs:
163-
command: custom
164-
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
156+
targetType: filePath
157+
filePath: ./build/RestoreGDK.ps1
158+
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
159+
failOnStderr: true
165160
- task: CmdLine@2
166161
displayName: Setup BWOI for GDK command-line
167162
inputs:
@@ -271,16 +266,13 @@ jobs:
271266
displayName: 'Secure Supply Chain Analysis'
272267
- task: NuGetAuthenticate@1
273268
displayName: 'NuGet Auth'
274-
- task: NuGetCommand@2
275-
displayName: NuGet install PGDK
276-
inputs:
277-
command: custom
278-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
279-
- task: NuGetCommand@2
280-
displayName: NuGet install GDKX
269+
- task: PowerShell@2
270+
displayName: 'NuGet Install GDK'
281271
inputs:
282-
command: custom
283-
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
272+
targetType: filePath
273+
filePath: ./build/RestoreGDK.ps1
274+
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
275+
failOnStderr: true
284276
- task: CmdLine@2
285277
displayName: Setup BWOI for GDK command-line
286278
inputs:

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,16 @@ resources:
5656
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
5757

5858
pool:
59-
vmImage: windows-2019
59+
vmImage: windows-2022
6060

6161
variables:
6262
- group: dxmesh-shared-variables
6363
- name: Codeql.Enabled
6464
value: false
6565
- name: EXTRACTED_FOLDER
6666
value: '$(ExtractedFolder)'
67+
- name: GDK_EDITION
68+
value: $(GDKEditionNumber)
6769
- name: GDKEnableBWOI
6870
value: true
6971
- name: URL_FEED
@@ -107,16 +109,13 @@ jobs:
107109
displayName: 'Secure Supply Chain Analysis'
108110
- task: NuGetAuthenticate@1
109111
displayName: 'NuGet Auth'
110-
- task: NuGetCommand@2
111-
displayName: NuGet install PGDK
112-
inputs:
113-
command: custom
114-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
115-
- task: NuGetCommand@2
116-
displayName: NuGet install GDKX
112+
- task: PowerShell@2
113+
displayName: 'NuGet Install GDK'
117114
inputs:
118-
command: custom
119-
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
115+
targetType: filePath
116+
filePath: ./build/RestoreGDK.ps1
117+
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
118+
failOnStderr: true
120119
- task: CopyFiles@2
121120
displayName: Set up Directory.Build.props
122121
inputs:
@@ -127,10 +126,9 @@ jobs:
127126
displayName: Setup BWOI VCTargets
128127
inputs:
129128
solution: build/SetupBWOI.targets
130-
msbuildVersion: 16.0
131129
msbuildArchitecture: x64
132130
msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
133131
- template: '/.azuredevops/templates/DirectXMesh-build-gdk.yml'
134132
parameters:
135-
msVersion: '16.0'
133+
msVersion: '17.0'
136134
vsYear: 2019

‎.azuredevops/pipelines/DirectXMesh-GitHub-SDK-release.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,3 +155,10 @@ jobs:
155155
Contents: 'Directory.Build.props'
156156
TargetFolder: $(Build.SourcesDirectory)
157157
- template: '/.azuredevops/templates/DirectXMesh-build-uwp.yml'
158+
- task: PublishPipelineArtifact@1
159+
displayName: Publish Build Logs
160+
condition: succeededOrFailed()
161+
inputs:
162+
targetPath: 'DirectXMesh\Bin\Windows10_2022\ARM64\Debug\DirectXMesh.tlog\'
163+
artifact: UWP.ARM64_Debug_Logs
164+
publishLocation: 'pipeline'

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ jobs:
8484
displayName: Build solution DirectXMesh_Tests_Desktop_2022.sln
8585
inputs:
8686
solution: Tests/DirectXMesh_Tests_Desktop_2022.sln
87-
vsVersion: 17.0
8887
msbuildArgs: /p:PreferredToolArchitecture=x64
8988
platform: '$(BuildPlatform)'
9089
configuration: '$(BuildConfiguration)'
@@ -94,7 +93,6 @@ jobs:
9493
displayName: Build solution DirectXMesh_Tests_Desktop_2022_Win10.sln
9594
inputs:
9695
solution: Tests/DirectXMesh_Tests_Desktop_2022_Win10.sln
97-
vsVersion: 17.0
9896
msbuildArgs: /p:PreferredToolArchitecture=x64
9997
platform: '$(BuildPlatform)'
10098
configuration: '$(BuildConfiguration)'

0 commit comments

Comments
 (0)