From: Eric Engestrom <eric.engestrom@intel.com>
Date: Wed, 8 May 2019 16:08:11 +0000 (+0200)
Subject: gitlab-ci: add the vulkan overlay layer to the vulkan build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c6306125b55adaa49e754293be79ef68673770e7;p=mesa.git

gitlab-ci: add the vulkan overlay layer to the vulkan build

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

[ Michel Dänzer: Take changes affecting the docker image from !299,
  plus remove the unzip package again before generating the image ]
---

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 67b2190a010..7c242ba9d2f 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -10,6 +10,7 @@ apt-get install -y \
       ca-certificates \
       curl \
       wget \
+      unzip \
       gnupg \
       software-properties-common
 
@@ -77,6 +78,13 @@ apt-get install -y \
 # for 64bit windows cross-builds
 apt-get install -y mingw-w64
 
+# for the vulkan overlay layer
+wget https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip
+unzip glslang-master-linux-Release.zip bin/glslangValidator
+install -m755 bin/glslangValidator /usr/local/bin/
+rm bin/glslangValidator glslang-master-linux-Release.zip
+
+
 # dependencies where we want a specific version
 export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
 export               XCB_RELEASES=https://xcb.freedesktop.org/dist
@@ -179,6 +187,7 @@ apt-get purge -y \
       libtool \
       make \
       curl \
+      unzip \
       wget \
       gnupg \
       software-properties-common