diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 320db5a15ee..8c161ed070f 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -34,7 +34,7 @@ variables: WINDOWS_X64_MSVC_TAG: "2023-12-22-msvc" WINDOWS_X64_BUILD_PATH: "windows/x86_64_build" - WINDOWS_X64_BUILD_TAG: "2023-12-22-msvc" + WINDOWS_X64_BUILD_TAG: "2024-01-17-vulkan-sdk" WINDOWS_X64_TEST_PATH: "windows/x86_64_test" - WINDOWS_X64_TEST_TAG: "2024-01-10-warp" + WINDOWS_X64_TEST_TAG: "2024-01-17-vulkan-sdk" diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1 index a140fdd1858..5cd78ce881d 100644 --- a/.gitlab-ci/windows/mesa_deps_build.ps1 +++ b/.gitlab-ci/windows/mesa_deps_build.ps1 @@ -158,12 +158,12 @@ Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $llvm_build Get-Date Write-Host "Cloning SPIRV-Tools" -git clone -b "sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Tools deps/SPIRV-Tools +git clone -b "vulkan-sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Tools deps/SPIRV-Tools if (!$?) { Write-Host "Failed to clone SPIRV-Tools repository" Exit 1 } -git clone -b "sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Headers deps/SPIRV-Tools/external/SPIRV-Headers +git clone -b "vulkan-sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Headers deps/SPIRV-Tools/external/SPIRV-Headers if (!$?) { Write-Host "Failed to clone SPIRV-Headers repository" Exit 1 diff --git a/.gitlab-ci/windows/mesa_deps_test_piglit.ps1 b/.gitlab-ci/windows/mesa_deps_test_piglit.ps1 index 9afa0bbb574..c8853795959 100644 --- a/.gitlab-ci/windows/mesa_deps_test_piglit.ps1 +++ b/.gitlab-ci/windows/mesa_deps_test_piglit.ps1 @@ -53,7 +53,7 @@ New-Item -ItemType Directory -Path "$piglit_source" | Out-Null Push-Location -Path $piglit_source git init git remote add origin https://gitlab.freedesktop.org/mesa/piglit.git -git fetch --depth 1 origin b41accc83689966f91217fc5b57dbe06202b8c8c # of branch main +git fetch --depth 1 origin 814046fe6942eac660ee4a6cc5fcc54011a49945 # of branch main if (!$?) { Write-Host "Failed to fetch Piglit repository" Pop-Location diff --git a/.gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1 b/.gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1 index 4144b8eba44..f2d0ec2481b 100644 --- a/.gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1 +++ b/.gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1 @@ -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.211.0" +$env:VULKAN_SDK_VERSION="1.3.275.0" $ProgressPreference = "SilentlyContinue"