From 7d1c0911436d4411cb6425b1d1d25b3bd1dd3138 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 21 Aug 2019 11:45:25 +0200 Subject: [PATCH] gitlab-ci: bump LLVM to 8 for meson-vulkan and meson-clover To fix pipeline builds. Signed-off-by: Samuel Pitoiset Reviewed-by: Eric Engestrom --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98dc3fcc703..8977b86341e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -213,12 +213,13 @@ meson-clover: script: - export GALLIUM_DRIVERS="r600,radeonsi" - .gitlab-ci/meson-build.sh - - LLVM_VERSION=7 .gitlab-ci/meson-build.sh + - LLVM_VERSION=8 .gitlab-ci/meson-build.sh - export GALLIUM_DRIVERS="i915,r600" - LLVM_VERSION=3.9 .gitlab-ci/meson-build.sh - LLVM_VERSION=4.0 .gitlab-ci/meson-build.sh - LLVM_VERSION=5.0 .gitlab-ci/meson-build.sh - LLVM_VERSION=6.0 .gitlab-ci/meson-build.sh + - LLVM_VERSION=7 .gitlab-ci/meson-build.sh meson-vulkan: extends: .meson-build @@ -240,7 +241,7 @@ meson-vulkan: -D gallium-nine=false -D gallium-opencl=disabled VULKAN_DRIVERS: intel,amd,freedreno - LLVM_VERSION: "7" + LLVM_VERSION: "8" EXTRA_OPTION: > -D vulkan-overlay-layer=true -- 2.30.2