From 793f6b30d9ec4bc8d4d1ab3bdb429acb7f7f3a20 Mon Sep 17 00:00:00 2001 From: Michel Dänzer Date: Tue, 8 Oct 2019 19:48:41 +0200 Subject: 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 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitlab-ci.yml') 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: -- cgit v1.2.3