From: Benjamin Tissoires Date: Fri, 29 Jan 2021 13:30:23 +0000 (+0100) Subject: CI: windows: Force using LLVM 12 X-Git-Tag: upstream/21.2.3~8708 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8deca5a72eaf0a014e52e446464be671454414ef;p=platform%2Fupstream%2Fmesa.git 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 Reviewed-by: Daniel Stone Signed-off-by: Benjamin Tissoires Part-of: --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13b7baa..742f18a 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 58efe95..7bea163 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