diff options
| author | Michel Dänzer <[email protected]> | 2019-04-04 18:01:27 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2019-04-16 10:41:07 +0200 |
| commit | e9de19ffcaace73931260cd8ef935f077c13ec23 (patch) | |
| tree | 22586141b291909de902b7625f458a9ff83e1def /.gitlab-ci.yml | |
| parent | ecb3eedc54995c722af6ee477f3d818169a9d129 (diff) | |
gitlab-ci: Install most packages from Debian buster
We now use the C frontend of GCC 8 instead of 6 (required tweaking the
before_script for the clang job). We cannot use the C++ frontend of GCC
7 or newer yet, because upstream GCC 7 changed some C++ name mangling
stuff in backwards incompatible ways, and LLVM < 6.0 packages aren't
available in buster.
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a53fae7f60..719fcb06be4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,12 +66,13 @@ debian: artifacts: when: on_failure untracked: true + variables: + CCACHE_COMPILERCHECK: "content" # Use ccache transparently, and print stats before/after before_script: - export PATH="/usr/lib/ccache:$PATH" - export CCACHE_BASEDIR="$PWD" - export CCACHE_DIR="$PWD/ccache" - - export CCACHE_COMPILERCHECK=content - ccache --zero-stats || true - ccache --show-stats || true after_script: @@ -148,6 +149,11 @@ meson-clang: GALLIUM_DRIVERS: "auto" CC: "ccache clang-7" CXX: "ccache clang++-7" + before_script: + - export CCACHE_BASEDIR="$PWD" CCACHE_DIR="$PWD/ccache" + - ccache --zero-stats --show-stats || true + # clang++ breaks if it picks up the GCC 8 directory without libstdc++.so + - apt-get remove -y libgcc-8-dev meson-vulkan: extends: .meson-build |