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>
This commit is contained in:
parent
a69ab2ae36
commit
8deca5a72e
|
@ -445,7 +445,7 @@ armhf_test:
|
|||
|
||||
.windows-docker-vs2019:
|
||||
variables:
|
||||
WINDOWS_TAG: "2021-01-27.1"
|
||||
WINDOWS_TAG: "2021-01-29"
|
||||
WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:${WINDOWS_TAG}-${MESA_TEMPLATES_COMMIT}"
|
||||
WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:${WINDOWS_TAG}-${MESA_TEMPLATES_COMMIT}"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue