mirror of
https://github.com/microsoft/DirectXTex
synced 2024-09-19 15:19:56 +00:00
Update build pipelines for recent changes to windows-2022 ADO images (#398)
This commit is contained in:
parent
3754a77d87
commit
e8c45a15ab
@ -51,8 +51,6 @@ variables:
|
|||||||
WIN11_SDK: '10.0.22000.0'
|
WIN11_SDK: '10.0.22000.0'
|
||||||
URL_MINGW32: https://github.com/brechtsanders/winlibs_mingw/releases/download/12.2.0-14.0.6-10.0.0-ucrt-r2/winlibs-i686-posix-dwarf-gcc-12.2.0-llvm-14.0.6-mingw-w64ucrt-10.0.0-r2.zip
|
URL_MINGW32: https://github.com/brechtsanders/winlibs_mingw/releases/download/12.2.0-14.0.6-10.0.0-ucrt-r2/winlibs-i686-posix-dwarf-gcc-12.2.0-llvm-14.0.6-mingw-w64ucrt-10.0.0-r2.zip
|
||||||
HASH_MINGW32: 'fcd1e11b896190da01c83d5b5fb0d37b7c61585e53446c2dab0009debc3915e757213882c35e35396329338de6f0222ba012e23a5af86932db45186a225d1272'
|
HASH_MINGW32: 'fcd1e11b896190da01c83d5b5fb0d37b7c61585e53446c2dab0009debc3915e757213882c35e35396329338de6f0222ba012e23a5af86932db45186a225d1272'
|
||||||
URL_MINGW64: https://github.com/brechtsanders/winlibs_mingw/releases/download/12.2.0-14.0.6-10.0.0-ucrt-r2/winlibs-x86_64-posix-seh-gcc-12.2.0-llvm-14.0.6-mingw-w64ucrt-10.0.0-r2.zip
|
|
||||||
HASH_MINGW64: '6694e552d73195b57f283645ab78cb0180f4d957b5501a83e6b4f2679dfad13a8e85e1df6f7b061ea4431fbd2bb0c8f2ac3a1dd810489c1a8d1665b226df8092'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- job: MINGW32_BUILD
|
- job: MINGW32_BUILD
|
||||||
@ -77,8 +75,7 @@ jobs:
|
|||||||
|
|
||||||
workingDirectory: $(Build.SourcesDirectory)\vcpkg
|
workingDirectory: $(Build.SourcesDirectory)\vcpkg
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
# We install GCC 12.2 as the MS Hosted only offers 11.2
|
displayName: Install MinGW32 and setup for Windows 11 SDK
|
||||||
displayName: Install MinGW32
|
|
||||||
inputs:
|
inputs:
|
||||||
targetType: inline
|
targetType: inline
|
||||||
script: |
|
script: |
|
||||||
@ -173,25 +170,11 @@ jobs:
|
|||||||
|
|
||||||
workingDirectory: $(Build.SourcesDirectory)\vcpkg
|
workingDirectory: $(Build.SourcesDirectory)\vcpkg
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
displayName: Install MinGW-W64
|
displayName: Setup for Shader Compilation
|
||||||
inputs:
|
inputs:
|
||||||
targetType: inline
|
targetType: inline
|
||||||
script: |
|
script: |
|
||||||
$ProgressPreference = 'SilentlyContinue'
|
$ProgressPreference = 'SilentlyContinue'
|
||||||
Write-Host "Downloading winlibs..."
|
|
||||||
Invoke-WebRequest -Uri "$(URL_MINGW64)" -OutFile "gw64.zip"
|
|
||||||
Write-Host "Downloaded."
|
|
||||||
$fileHash = Get-FileHash -Algorithm SHA512 gw64.zip | ForEach { $_.Hash} | Out-String
|
|
||||||
$filehash = $fileHash.Trim()
|
|
||||||
Write-Host "##[debug]SHA512: " $fileHash
|
|
||||||
if ($fileHash -ne '$(HASH_MINGW64)') {
|
|
||||||
Write-Error -Message "##[error]Computed hash does not match!" -ErrorAction Stop
|
|
||||||
}
|
|
||||||
Write-Host "Extracting winlibs..."
|
|
||||||
Expand-Archive -LiteralPath 'gw64.zip'
|
|
||||||
Write-Host "Extracted."
|
|
||||||
Write-Host "Added to path: $env:BUILD_SOURCESDIRECTORY\gw64\mingw64\bin"
|
|
||||||
Write-Host "##vso[task.prependpath]$env:BUILD_SOURCESDIRECTORY\gw64\mingw64\bin"
|
|
||||||
$sdkroot = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows Kits\Installed Roots' | Select-Object -ExpandProperty KitsRoot10
|
$sdkroot = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows Kits\Installed Roots' | Select-Object -ExpandProperty KitsRoot10
|
||||||
$windows11sdk = "{0}bin\$(WIN11_SDK)\" -f $sdkroot
|
$windows11sdk = "{0}bin\$(WIN11_SDK)\" -f $sdkroot
|
||||||
$windows11x64sdk = "{0}bin\$(WIN11_SDK)\x64" -f $sdkroot
|
$windows11x64sdk = "{0}bin\$(WIN11_SDK)\x64" -f $sdkroot
|
||||||
@ -203,7 +186,6 @@ jobs:
|
|||||||
Write-Error -Message "##[error]Can't find Windows SDK ($(WIN11_SDK))" -ErrorAction Stop
|
Write-Error -Message "##[error]Can't find Windows SDK ($(WIN11_SDK))" -ErrorAction Stop
|
||||||
}
|
}
|
||||||
|
|
||||||
workingDirectory: $(Build.SourcesDirectory)
|
|
||||||
- task: BatchScript@1
|
- task: BatchScript@1
|
||||||
displayName: CompileShaders.cmd
|
displayName: CompileShaders.cmd
|
||||||
inputs:
|
inputs:
|
||||||
|
@ -162,6 +162,11 @@ jobs:
|
|||||||
script: git clone --quiet https://%GITHUB_PAT%@github.com/walbourn/directxtextest.git Tests
|
script: git clone --quiet https://%GITHUB_PAT%@github.com/walbourn/directxtextest.git Tests
|
||||||
workingDirectory: $(Build.SourcesDirectory)
|
workingDirectory: $(Build.SourcesDirectory)
|
||||||
failOnStderr: true
|
failOnStderr: true
|
||||||
|
- task: ChocolateyCommand@0
|
||||||
|
displayName: Install Ninja
|
||||||
|
inputs:
|
||||||
|
command: 'install'
|
||||||
|
installPackageId: 'ninja'
|
||||||
- task: CmdLine@2
|
- task: CmdLine@2
|
||||||
displayName: Setup environment for CMake to use VS
|
displayName: Setup environment for CMake to use VS
|
||||||
inputs:
|
inputs:
|
||||||
|
Loading…
Reference in New Issue
Block a user