From: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri, 5 Apr 2019 08:36:29 +0000 (+0200)
Subject: gitlab-ci: Use clang 8 instead of 7
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3fca2b760c2780f5b6e382ccbfc6ceae303ac181;p=mesa.git

gitlab-ci: Use clang 8 instead of 7

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 719fcb06be4..105b19f0813 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -147,8 +147,8 @@ meson-clang:
     UNWIND: "true"
     DRI_DRIVERS: "auto"
     GALLIUM_DRIVERS: "auto"
-    CC: "ccache clang-7"
-    CXX: "ccache clang++-7"
+    CC: "ccache clang-8"
+    CXX: "ccache clang++-8"
   before_script:
     - export CCACHE_BASEDIR="$PWD" CCACHE_DIR="$PWD/ccache"
     - ccache --zero-stats --show-stats || true
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index d2e1f1e687d..0abaf67cee6 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -15,6 +15,7 @@ apt-get install -y \
 
 curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
 add-apt-repository "deb https://apt.llvm.org/stretch/ llvm-toolchain-stretch-7 main"
+add-apt-repository "deb https://apt.llvm.org/stretch/ llvm-toolchain-stretch-8 main"
 
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
 echo 'deb https://deb.debian.org/debian stretch-backports main' >/etc/apt/sources.list.d/backports.list
@@ -31,7 +32,7 @@ apt-get install -y -t stretch-backports \
       clang-6.0 \
       libclang-6.0-dev \
       g++ \
-      clang-7 \
+      clang-8 \
       libclang-7-dev
 
 # Install remaining packages from Debian buster to get newer versions