diff options
| author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2021-01-29 14:30:23 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2021-03-18 11:27:46 -0700 |
| commit | 296053b9e4e360222f69fdc01da7c004b60f4526 (patch) | |
| tree | 76d78bce10fffb13653a6bb4522b1ae72b72a561 | |
| parent | 92af3add353c02b318ff0bf58f96c3549fd8418b (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>
(cherry picked from commit 8deca5a72eaf0a014e52e446464be671454414ef)
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/windows/mesa_deps.ps1 | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a979b5eeca0..7ec646e7514 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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}" 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 |