From 42267588d7dc92e566a9ce845e957a4fba9d3dc9 Mon Sep 17 00:00:00 2001
From: Jesse Natalie <jenatali@microsoft.com>
Date: Tue, 7 Feb 2023 09:21:07 -0800
Subject: [PATCH] ci/windows: Update LLVM to 15

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21168>
---
 .gitlab-ci/image-tags.yml              |  2 +-
 .gitlab-ci/windows/mesa_deps_build.ps1 | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index d3bca97f14c..57660deda9d 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -27,7 +27,7 @@ variables:
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
-   WINDOWS_X64_BUILD_TAG: "2023-01-03-ci-libva-2.17"
+   WINDOWS_X64_BUILD_TAG: "2023-02-07-llvm-15"
 
    WINDOWS_X64_TEST_PATH: "windows/x64_test"
    WINDOWS_X64_TEST_TAG: "2023-01-13-warp-update"
diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1
index 4367980970d..d09bb490f6a 100644
--- a/.gitlab-ci/windows/mesa_deps_build.ps1
+++ b/.gitlab-ci/windows/mesa_deps_build.ps1
@@ -84,26 +84,20 @@ if (!$buildstatus) {
 }
 
 Get-Date
-Write-Host "Cloning LLVM release/12.x"
-git clone -b release/12.x --depth=1 https://github.com/llvm/llvm-project deps/llvm-project
+Write-Host "Cloning LLVM release/15.x"
+git clone -b release/15.x --depth=1 https://github.com/llvm/llvm-project deps/llvm-project
 if (!$?) {
   Write-Host "Failed to clone LLVM repository"
   Exit 1
 }
 
-# ideally we want to use a tag here insted of a sha,
-# but as of today, SPIRV-LLVM-Translator doesn't have
-# a tag matching LLVM 12.0.0
 Get-Date
 Write-Host "Cloning SPIRV-LLVM-Translator"
-git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator deps/llvm-project/llvm/projects/SPIRV-LLVM-Translator
+git clone -b llvm_release_150 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
 }
-Push-Location deps/llvm-project/llvm/projects/SPIRV-LLVM-Translator
-git checkout 5b641633b3bcc3251a52260eee11db13a79d7258
-Pop-Location
 
 Get-Date
 # slightly convoluted syntax but avoids the CWD being under the PS filesystem meta-path