From: Erik Faye-Lund Date: Tue, 22 Oct 2019 07:08:11 +0000 (+0200) Subject: gitlab-ci: also build Zink on CI X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d529c173931a53d08e398fa5366243bcbab24e7;p=mesa.git gitlab-ci: also build Zink on CI This prevents accidentally breaking the driver-build while working on other drivers. Signed-off-by: Erik Faye-Lund --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af6324cad72..bb5c76a909f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ variables: UPSTREAM_REPO: mesa/mesa DEBIAN_TAG: "2019-10-22" - DEBIAN_ARM64_TAG: "arm64v8-2019-10-22" + DEBIAN_ARM64_TAG: "arm64v8-2019-10-23" STRETCH_TAG: "2019-09-18" DEBIAN_VERSION: buster-slim STRETCH_VERSION: stretch-slim @@ -189,7 +189,7 @@ meson-main: -D gallium-xa=true -D gallium-nine=true -D gallium-opencl=disabled - GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima" + GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink" LLVM_VERSION: "7" EXTRA_OPTION: > -D osmesa=gallium diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 774b8e02128..ce536e57086 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -63,6 +63,7 @@ apt-get install -y --no-remove \ libpng-dev \ libgbm-dev \ libgles2-mesa-dev \ + libvulkan-dev \ python-mako \ python3-mako \ bison \