summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-02-14 15:47:20 +1000
committerMarge Bot <eric+marge@anholt.net>2020-02-15 04:15:00 +0000
commit8f5a252d350cb1abcad13f7d637548a8e0e7da33 (patch)
treeb64a660785b354d602888d310f4a1b28bbf81cff /.gitlab-ci.yml
parente7375e17958993b90d9f01d76dbc7eacdbf8c195 (diff)
ci: bump debian image and change llvm deps to 8
v3: remove version in a few places (Michel) Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3805> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3805>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac2648cfa5c..9e70ce88233 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,7 +112,7 @@ x86_build:
- .debian@container-ifnot-exists
- .container
variables:
- DEBIAN_TAG: &x86_build "2020-02-05"
+ DEBIAN_TAG: &x86_build "2020-02-15"
.use-x86_build:
variables:
@@ -473,7 +473,6 @@ meson-s390x:
variables:
CROSS: s390x
GALLIUM_DRIVERS: "swrast"
- LLVM_VERSION: "7"
script:
- dpkg -i /var/cache/apt/archives/$CROSS/*.deb
- .gitlab-ci/meson-build.sh
@@ -484,7 +483,6 @@ meson-ppc64el:
variables:
CROSS: ppc64el
GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl"
- LLVM_VERSION: "8"
VULKAN_DRIVERS: "amd"
meson-mingw32-x86_64: