Update ADO coverage for clang v12 (#592)

This commit is contained in:
Chuck Walbourn 2025-03-06 13:31:45 -08:00 committed by GitHub
parent 51f33c3471
commit d6fdfee00f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 95 additions and 96 deletions

View File

@ -107,116 +107,76 @@ jobs:
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out2 -v --config RelWithDebInfo cmakeArgs: --build out2 -v --config RelWithDebInfo
- task: CMake@1
displayName: 'CMake (MSVC): Config ARM64'
inputs:
cwd: $(Build.SourcesDirectory)
cmakeArgs: -G "$(VS_GENERATOR)" -A ARM64 -B out3 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
- task: CMake@1
displayName: 'CMake (MSVC): Build ARM64 Debug'
inputs:
cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out3 -v --config Debug
- task: CMake@1
displayName: 'CMake (MSVC): Build ARM64 Release'
inputs:
cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out3 -v --config RelWithDebInfo
- task: CMake@1 - task: CMake@1
displayName: 'CMake (UWP): Config x64' displayName: 'CMake (UWP): Config x64'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out4 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out3 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
- task: CMake@1 - task: CMake@1
displayName: 'CMake (UWP): Build x64' displayName: 'CMake (UWP): Build x64'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out4 -v cmakeArgs: --build out3 -v
- task: CMake@1 - task: CMake@1
displayName: 'CMake (ClangCl): Config x64' displayName: 'CMake (ClangCl): Config x64'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out6 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
- task: CMake@1 - task: CMake@1
displayName: 'CMake (ClangCl): Build x64 Debug' displayName: 'CMake (ClangCl): Build x64 Debug'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out6 -v --config Debug cmakeArgs: --build out4 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (ClangCl): Build x64 Release' displayName: 'CMake (ClangCl): Build x64 Release'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out6 -v --config RelWithDebInfo cmakeArgs: --build out4 -v --config RelWithDebInfo
- task: CMake@1
displayName: 'CMake (ClangCl): Config ARM64'
inputs:
cwd: $(Build.SourcesDirectory)
cmakeArgs: -G "$(VS_GENERATOR)" -A ARM64 -T clangcl -B out7 -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
- task: CMake@1
displayName: 'CMake (ClangCl): Build ARM64'
inputs:
cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out7 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (Win10): Config' displayName: 'CMake (Win10): Config'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out8 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out5 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON
- task: CMake@1 - task: CMake@1
displayName: 'CMake (Win10): Build' displayName: 'CMake (Win10): Build'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out8 -v --config Debug cmakeArgs: --build out5 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (MSVC Spectre): Config x64' displayName: 'CMake (MSVC Spectre): Config x64'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out9 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out6 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
- task: CMake@1 - task: CMake@1
displayName: 'CMake (MSVC Spectre): Build x64 Debug' displayName: 'CMake (MSVC Spectre): Build x64 Debug'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out9 -v --config Debug cmakeArgs: --build out6 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (MSVC Spectre): Build x64 Release' displayName: 'CMake (MSVC Spectre): Build x64 Release'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out9 -v --config RelWithDebInfo cmakeArgs: --build out6 -v --config RelWithDebInfo
- task: CMake@1
displayName: 'CMake (MSVC Spectre): Config ARM64'
inputs:
cwd: $(Build.SourcesDirectory)
cmakeArgs: -G "$(VS_GENERATOR)" -A ARM64 -B out10 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
- task: CMake@1
displayName: 'CMake (MSVC Spectre): Build ARM64 Debug'
inputs:
cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out10 -v --config Debug
- task: CMake@1
displayName: 'CMake (MSVC Spectre): Build ARM64 Release'
inputs:
cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out10 -v --config RelWithDebInfo
- task: CMake@1 - task: CMake@1
displayName: 'CMake (Win10 Spectre): Config' displayName: 'CMake (Win10 Spectre): Config'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out11 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out7 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON
- task: CMake@1 - task: CMake@1
displayName: 'CMake (Win10 Spectre): Build' displayName: 'CMake (Win10 Spectre): Build'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out11 -v --config Debug cmakeArgs: --build out7 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (NO_WCHAR_T): Config' displayName: 'CMake (NO_WCHAR_T): Config'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out12 -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_DX12=ON cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out8 -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_DX12=ON
- task: CMake@1 - task: CMake@1
displayName: 'CMake (NO_WCHAR_T): Build' displayName: 'CMake (NO_WCHAR_T): Build'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out12 -v --config Debug cmakeArgs: --build out8 -v --config Debug
- job: CMAKE_BUILD_VCPKG - job: CMAKE_BUILD_VCPKG
displayName: CMake using VCPKG displayName: CMake using VCPKG

View File

@ -40,6 +40,7 @@ pool:
variables: variables:
Codeql.Enabled: false Codeql.Enabled: false
VC_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
GUID_FEED: $(ADOFeedGUID) GUID_FEED: $(ADOFeedGUID)
jobs: jobs:
@ -131,19 +132,85 @@ jobs:
msbuildArgs: /p:PreferredToolArchitecture=x64 msbuildArgs: /p:PreferredToolArchitecture=x64
platform: x64 platform: x64
configuration: Release configuration: Release
- task: VSBuild@1
displayName: Build solution DirectXTex_Tests_Desktop_2019_Win10.sln arm64dbg - job: CMAKE_BUILD_X64
displayName: 'CMake for X64 BUILD_TESTING=ON'
timeoutInMinutes: 120
workspace:
clean: all
steps:
- checkout: self
clean: true
fetchTags: false
fetchDepth: 1
path: 's'
- checkout: testRepo
displayName: Fetch Tests
clean: true
fetchTags: false
fetchDepth: 1
path: 's/Tests'
- task: CmdLine@2
displayName: Setup environment for CMake to use VS
inputs: inputs:
solution: Tests/DirectXTex_Tests_Desktop_2019_Win10.sln script: |
vsVersion: 16.0 call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
msbuildArgs: /p:PreferredToolArchitecture=x64 echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
platform: ARM64 echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
configuration: Debug echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
- task: VSBuild@1 echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
displayName: Build solution DirectXTex_Tests_Desktop_2019_Win10.sln arm64rel echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
echo ##vso[task.prependpath]%VCToolsInstallDir%bin\Hostx64\x64
echo ##vso[task.setvariable variable=EXTERNAL_INCLUDE;]%EXTERNAL_INCLUDE%
echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
echo ##vso[task.setvariable variable=LIB;]%LIB%
- task: CMake@1
displayName: CMake (MSVC; x64-Debug) Config
inputs: inputs:
solution: Tests/DirectXTex_Tests_Desktop_2019_Win10.sln cwd: '$(Build.SourcesDirectory)'
vsVersion: 16.0 cmakeArgs: --preset=x64-Debug
msbuildArgs: /p:PreferredToolArchitecture=x64 - task: CMake@1
platform: ARM64 displayName: CMake (MSVC; x64-Debug) Build
configuration: Release inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --build out/build/x64-Debug -v
- task: DeleteFiles@1
inputs:
Contents: 'out'
- task: CMake@1
displayName: CMake (MSVC; x64-Release) Config
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --preset=x64-Release
- task: CMake@1
displayName: CMake (MSVC; x64-Release) Build
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --build out/build/x64-Release -v
- task: DeleteFiles@1
inputs:
Contents: 'out'
- task: CMake@1
displayName: CMake (clang/LLVM; x64-Debug) Config
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --preset=x64-Debug-Clang
- task: CMake@1
displayName: CMake (clang/LLVM; x64-Debug) Build
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --build out/build/x64-Debug-Clang -v
- task: DeleteFiles@1
inputs:
Contents: 'out'
- task: CMake@1
displayName: CMake (clang/LLVM; x64-Release) Config
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --preset=x64-Release-Clang
- task: CMake@1
displayName: CMake (clang/LLVM; x64-Release) Build
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --build out/build/x64-Release-Clang -v

View File

@ -102,20 +102,6 @@ jobs:
msbuildArgs: /p:PreferredToolArchitecture=x64 msbuildArgs: /p:PreferredToolArchitecture=x64
platform: x64 platform: x64
configuration: Release configuration: Release
- task: VSBuild@1
displayName: Build solution DirectXTex_Desktop_2019_Win10.sln arm64dbg
inputs:
solution: DirectXTex_Desktop_2019_Win10.sln
msbuildArgs: /p:PreferredToolArchitecture=x64
platform: ARM64
configuration: Debug
- task: VSBuild@1
displayName: Build solution DirectXTex_Desktop_2019_Win10.sln arm64rel
inputs:
solution: DirectXTex_Desktop_2019_Win10.sln
msbuildArgs: /p:PreferredToolArchitecture=x64
platform: ARM64
configuration: Release
- job: DESKTOP_BUILD_SPECTRE - job: DESKTOP_BUILD_SPECTRE
displayName: 'Win32 Desktop (Spectre-mitigated)' displayName: 'Win32 Desktop (Spectre-mitigated)'
@ -181,17 +167,3 @@ jobs:
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
platform: x64 platform: x64
configuration: Release configuration: Release
- task: VSBuild@1
displayName: Build solution DirectXTex_Desktop_2019_Win10.sln arm64dbg
inputs:
solution: DirectXTex_Desktop_2019_Win10.sln
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
platform: ARM64
configuration: Debug
- task: VSBuild@1
displayName: Build solution DirectXTex_Desktop_2019_Win10.sln arm64rel
inputs:
solution: DirectXTex_Desktop_2019_Win10.sln
msbuildArgs: /p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
platform: ARM64
configuration: Release