fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CI/Windows: Update container deps

Browse source 
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33294>
This commit is contained in:
Jesse Natalie 2025-01-29 15:48:44 -08:00 • committed by Marge Bot
parent 049015a7b8
commit a4b1924b22
4 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci/image-tags.yml
View file

@ -46,10 +46,10 @@ variables:
FLUSTER_VECTORS_VERSION: "5"
WINDOWS_X64_MSVC_PATH: "windows/x86_64_msvc"
WINDOWS_X64_MSVC_TAG: "20240827-v143"
WINDOWS_X64_MSVC_TAG: "20250129-llvm19"
WINDOWS_X64_BUILD_PATH: "windows/x86_64_build"
WINDOWS_X64_BUILD_TAG: "20250130-vulkan-sdk"
WINDOWS_X64_BUILD_TAG: "20250129-llvm19"
WINDOWS_X64_TEST_PATH: "windows/x86_64_test"
WINDOWS_X64_TEST_TAG: "20250130-vulkan-sdk"
WINDOWS_X64_TEST_TAG: "20250129-llvm19"

6
.gitlab-ci/windows/mesa_deps_build.ps1
View file

@ -57,7 +57,7 @@ if (!$buildstatus) {
Get-Date
Write-Host "Cloning LLVM release/15.x"
git clone -b release/15.x --depth=1 https://github.com/llvm/llvm-project deps/llvm-project
git clone -b llvmorg-19.1.6 --depth=1 https://github.com/llvm/llvm-project deps/llvm-project
if (!$?) {
Write-Host "Failed to clone LLVM repository"
Exit 1
@ -65,7 +65,7 @@ if (!$?) {
Get-Date
Write-Host "Cloning SPIRV-LLVM-Translator"
git clone -b llvm_release_150 https://github.com/KhronosGroup/SPIRV-LLVM-Translator deps/llvm-project/llvm/projects/SPIRV-LLVM-Translator
git clone -b v19.1.3 https://github.com/KhronosGroup/SPIRV-LLVM-Translator deps/llvm-project/llvm/projects/SPIRV-LLVM-Translator
if (!$?) {
Write-Host "Failed to clone SPIRV-LLVM-Translator repository"
Exit 1
@ -79,7 +79,7 @@ Write-Host "Compiling LLVM and Clang"
cmake ../llvm `
-GNinja `
-DCMAKE_BUILD_TYPE=Release `
-DLLVM_USE_CRT_RELEASE=MT `
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded `
-DCMAKE_PREFIX_PATH="$depsInstallPath" `
-DCMAKE_INSTALL_PREFIX="$depsInstallPath" `
-DLLVM_ENABLE_PROJECTS="clang" `

2
.gitlab-ci/windows/mesa_deps_choco.ps1
View file

@ -63,6 +63,8 @@ Update-SessionEnvironment
Start-Process -NoNewWindow -Wait git -ArgumentList 'config --global core.autocrlf false'
New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
Write-Host "Upgrading pip at:"
Get-Date
python -m pip install --upgrade pip --progress-bar off

15
.gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1
View file

@ -2,7 +2,7 @@
# Touch this file needs update both WINDOWS_X64_BUILD_TAG WINDOWS_X64_TEST_TAG
# This file needs run in administrator mode
$env:VULKAN_SDK_VERSION="1.3.280.0"
$env:VULKAN_SDK_VERSION="1.4.304.0"
$ProgressPreference = "SilentlyContinue"
@ -22,18 +22,5 @@ if (!$?) {
}
Remove-Item "${env:TMP}\vulkan_sdk.exe" -Force
$VULKAN_RUNTIME_URL="https://sdk.lunarg.com/sdk/download/$env:VULKAN_SDK_VERSION/windows/VulkanRT-$env:VULKAN_SDK_VERSION-Installer.exe"
Write-Host "Downloading Vulkan-Runtime $VULKAN_RUNTIME_URL at:"
Get-Date
Invoke-WebRequest -Uri "$VULKAN_RUNTIME_URL" -OutFile "${env:TMP}\vulkan-runtime.exe" | Out-Null
Write-Host "Installing Vulkan-Runtime at:"
Get-Date
Start-Process -NoNewWindow -Wait "${env:TMP}\vulkan-runtime.exe" -ArgumentList '/S'
if (!$?) {
Write-Host "Failed to install Vulkan-Runtime"
Exit 1
}
Remove-Item "${env:TMP}\vulkan-runtime.exe" -Force
Write-Host "Installing Vulkan-Runtime finished at:"
Get-Date