summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2019-10-08 19:48:41 +0200
committerMichel Dänzer <michel@daenzer.net>2019-10-22 10:26:29 +0000
commit793f6b30d9ec4bc8d4d1ab3bdb429acb7f7f3a20 (patch)
tree26efab5a644f0160d7239a98e0dca9e153e37897 /.gitlab-ci.yml
parent59e7f1413cafd30145412dd03550105b74b7be96 (diff)
downloadmesa-793f6b30d9ec4bc8d4d1ab3bdb429acb7f7f3a20.tar.gz
gitlab-ci: Enable llvmpipe in ARM build jobs
v2: * Use LLVM 8 from buster-backports v3: * Use LLVM 7 again for armhf, llvmpipe is still broken there with LLVM 8 Acked-by: Eric Engestrom <eric.engestrom@intel.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cde2945b58..d534345a4d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -202,14 +202,13 @@ meson-main:
-D gallium-va=false
-D gallium-xa=false
-D gallium-nine=false
- -D llvm=false
.meson-arm:
extends: .meson-cross
image: $DEBIAN_ARM64_IMAGE
variables:
VULKAN_DRIVERS: freedreno
- GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
+ GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4"
EXTRA_OPTION: >
-D I-love-half-baked-turnips=true
needs:
@@ -221,6 +220,7 @@ meson-armhf:
extends: .meson-arm
variables:
CROSS: armhf
+ LLVM_VERSION: "7"
meson-arm64:
extends: