Mesa (staging/21.0): CI: Use a sha for the Windows SPIRV-LLVM-Translator dependency

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: 588015eab6ccb9fc113ed026cfc41f9b621ac892
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=588015eab6ccb9fc113ed026cfc41f9b621ac892

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Fri Feb 12 08:53:58 2021 -0800

CI: Use a sha for the Windows SPIRV-LLVM-Translator dependency

Acked-by: Daniel Stone (daniels at collabora.com)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9018>
(cherry picked from commit f59e6ad5d76b111a2123efa8b1d3f5c2f3c9400d)

---

 .gitlab-ci/windows/mesa_deps.ps1 | 9 ++++++---
 .pick_status.json                | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/windows/mesa_deps.ps1 b/.gitlab-ci/windows/mesa_deps.ps1
index 79c9a061dea..a2ec1a08417 100644
--- a/.gitlab-ci/windows/mesa_deps.ps1
+++ b/.gitlab-ci/windows/mesa_deps.ps1
@@ -62,16 +62,19 @@ if (!$?) {
   Exit 1
 }
 
-# ideally we need to use a tag here instead of master
+# 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, which is not yet out TBH
+# a tag matching LLVM 12.0.0
 Get-Date
 Write-Host "Cloning SPIRV-LLVM-Translator"
-git clone -b master https://github.com/KhronosGroup/SPIRV-LLVM-Translator llvm-project/llvm/projects/SPIRV-LLVM-Translator
+git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator llvm-project/llvm/projects/SPIRV-LLVM-Translator
 if (!$?) {
   Write-Host "Failed to clone SPIRV-LLVM-Translator repository"
   Exit 1
 }
+Push-Location 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
diff --git a/.pick_status.json b/.pick_status.json
index 995c24d254d..8275fcfef8c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -13900,7 +13900,7 @@
         "description": "CI: Use a sha for the Windows SPIRV-LLVM-Translator dependency",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },