OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitlab-ci: Use clang 8 instead of 7

Browse Source 
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
Michel Dänzer
2019-04-05 10:36:29 +02:00
committed by Michel Dänzer
parent 979df83940
commit 3fca2b760c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -147,8 +147,8 @@ meson-clang:
UNWIND: "true" UNWIND: "true"
DRI_DRIVERS: "auto" DRI_DRIVERS: "auto"
GALLIUM_DRIVERS: "auto" GALLIUM_DRIVERS: "auto"
CC: "ccache clang-7" CC: "ccache clang-8"
CXX: "ccache clang++-7" CXX: "ccache clang++-8"
before_script: before_script:
- export CCACHE_BASEDIR="$PWD" CCACHE_DIR="$PWD/ccache" - export CCACHE_BASEDIR="$PWD" CCACHE_DIR="$PWD/ccache"
- ccache --zero-stats --show-stats || true - ccache --zero-stats --show-stats || true

3
.gitlab-ci/debian-install.sh
View File

@@ -15,6 +15,7 @@ apt-get install -y \
curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - 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-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 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 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 \ clang-6.0 \
libclang-6.0-dev \ libclang-6.0-dev \
g++ \ g++ \
clang-7 \ clang-8 \
libclang-7-dev libclang-7-dev
# Install remaining packages from Debian buster to get newer versions # Install remaining packages from Debian buster to get newer versions