diff options
| author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2021-01-29 14:30:23 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-01-29 17:54:56 +0000 |
| commit | 8deca5a72eaf0a014e52e446464be671454414ef (patch) | |
| tree | 511b0496ffa0d818824c0b90778085658c4f0bf1 /.gitlab-ci | |
| parent | a69ab2ae3693fd817d6ba0d0345aca6931a6c5fd (diff) | |
CI: windows: Force using LLVM 12
LLVM is moving to the 13 release, but LLVM-SPIRV is still so in the past.
Given that LLVM 12.0.0 is still not out (we are at 12.0.0-rc1 today),
use the `release/12.x` branch for LLVM.
We should also tag LLVM-SPIRV, but... it seems that they haven't caught up
yet, so keep using the master branch, but add a note for a future
committer.
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8740>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/windows/mesa_deps.ps1 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci/windows/mesa_deps.ps1 b/.gitlab-ci/windows/mesa_deps.ps1 index 58efe95ec44..7bea163588f 100644 --- a/.gitlab-ci/windows/mesa_deps.ps1 +++ b/.gitlab-ci/windows/mesa_deps.ps1 @@ -45,12 +45,15 @@ if (!$?) { Get-Date Write-Host "Cloning LLVM master" -git clone -b master --depth=1 https://github.com/llvm/llvm-project llvm-project +git clone -b release/12.x --depth=1 https://github.com/llvm/llvm-project llvm-project if (!$?) { Write-Host "Failed to clone LLVM repository" Exit 1 } +# ideally we need to use a tag here instead of master +# but as of today, SPIRV-LLVM-Translator doesn't have +# a tag matching LLVM 12.0.0, which is not yet out TBH 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 |