OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: windows: Force using LLVM 12

Browse Source 
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:
Benjamin Tissoires
2021-01-29 14:30:23 +01:00
committed by Marge Bot
parent a69ab2ae36
commit 8deca5a72e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -445,7 +445,7 @@ armhf_test:
.windows-docker-vs2019: .windows-docker-vs2019:
variables: 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_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}" WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:${WINDOWS_TAG}-${MESA_TEMPLATES_COMMIT}"

5
.gitlab-ci/windows/mesa_deps.ps1
View File

@@ -45,12 +45,15 @@ if (!$?) {
Get-Date Get-Date
Write-Host "Cloning LLVM master" 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 (!$?) { if (!$?) {
Write-Host "Failed to clone LLVM repository" Write-Host "Failed to clone LLVM repository"
Exit 1 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 Get-Date
Write-Host "Cloning SPIRV-LLVM-Translator" 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 -b master https://github.com/KhronosGroup/SPIRV-LLVM-Translator llvm-project/llvm/projects/SPIRV-LLVM-Translator