summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2019-08-21 11:45:25 +0200
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>2019-08-23 08:13:31 +0200
commit7d1c0911436d4411cb6425b1d1d25b3bd1dd3138 (patch)
tree8ed54ded9d6e6c370376c93de95885be08d96e7f /.gitlab-ci.yml
parent1fd60db4a1fca96ccf9293d0c03158baf7d215a5 (diff)
downloadmesa-7d1c0911436d4411cb6425b1d1d25b3bd1dd3138.tar.gz
gitlab-ci: bump LLVM to 8 for meson-vulkan and meson-clover
To fix pipeline builds. Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml5
1 files 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