aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorDaniel Stone <[email protected]>2020-05-05 15:49:22 +0100
committerMarge Bot <[email protected]>2020-05-14 06:40:54 +0000
commit0f46a3191ff31a89d6969a67f8b50dbedf085dca (patch)
tree82a9b162935e7c09d32bf4c09c5c467276f3e165 /.gitlab-ci.yml
parent69ffbcb16244fc4f1161dd4082eb93b7a80232e5 (diff)
CI: Windows: Build LLVM and llvmpipe
We will eventually need to build our own LLVM on Windows in order to build libclc and other bits which are required for the d3d12 build, as well as to be able to test SPIR-V/OpenCL on llvmpipe. Start doing this now, building into the base container, and exercise this by building llvmpipe under Windows. Signed-off-by: Daniel Stone <[email protected]> Reviewed-by: Jose Fonseca <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4946>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 079f9c7979e..6b7b6e4b359 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -211,7 +211,7 @@ arm_test:
.windows-docker-vs2019:
variables:
- WINDOWS_TAG: "2020-03-24"
+ WINDOWS_TAG: "2020-05-05-llvm"
WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:$WINDOWS_TAG"
WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:$WINDOWS_TAG"
@@ -222,6 +222,7 @@ windows_build_vs2019:
stage: container
variables:
GIT_STRATEGY: fetch # we do actually need the full repository though
+ timeout: 4h # LLVM takes ages
tags:
- windows
- shell