diff options
| author | Michel Dänzer <[email protected]> | 2019-12-13 11:02:16 +0100 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2020-01-07 11:00:16 +0100 |
| commit | 5f0ff004ca8f0e59270f0ea4dc8f13c74ce88e2b (patch) | |
| tree | c712fc606d695f0ccc3acbb1ff8e5f9b591ecc83 /.gitlab-ci/container/x86_test-vk.sh | |
| parent | 4cd3dc94ad7ba991c960457b9134ce233b5b41ab (diff) | |
gitlab-ci: Test against LLVM / clang 9 on x86
They're not available for Debian buster yet, so we have to use upstream
snapshot packages again.
In contrast to earlier, we now store the LLVM APT repository key in Git
instead of re-downloading it every time.
Diffstat (limited to '.gitlab-ci/container/x86_test-vk.sh')
| -rw-r--r-- | .gitlab-ci/container/x86_test-vk.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh index da877590de1..e1f95f300d1 100644 --- a/.gitlab-ci/container/x86_test-vk.sh +++ b/.gitlab-ci/container/x86_test-vk.sh @@ -5,7 +5,13 @@ set -o xtrace export DEBIAN_FRONTEND=noninteractive -apt-get install -y ca-certificates +apt-get install -y \ + ca-certificates \ + gnupg \ + +# Upstream LLVM package repository +apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key +echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/sources.list.d/llvm9.list sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list @@ -40,7 +46,7 @@ apt-get install -y --no-remove \ libxkbcommon-dev \ libxrender1 \ libxrender-dev \ - libllvm8 \ + libllvm9 \ meson \ patch \ pkg-config \ @@ -66,6 +72,7 @@ apt-get purge -y \ g++ \ gcc \ git \ + gnupg \ libgbm-dev \ libgles2-mesa-dev \ libpng-dev \ |