From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 26 Feb 2020 08:32:41 +0000 (+0100)
Subject: gitlab-ci: build Fossilize in the test image for VK
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=93fcc9ad57a7e0e64ae45988e62b24563ff9fdc3;p=mesa.git

gitlab-ci: build Fossilize in the test image for VK

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3960>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3beed8d4982..ce35c57df3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,7 +137,7 @@ x86_test-gl:
 x86_test-vk:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test-vk "2020-03-04"
+    DEBIAN_TAG: &x86_test-vk "2020-03-05"
   # Can only be triggered manually on personal branches because RADV is the only
   # driver that does Vulkan testing at the moment.
   rules:
diff --git a/.gitlab-ci/build-fossilize.sh b/.gitlab-ci/build-fossilize.sh
new file mode 100644
index 00000000000..35af32baa5b
--- /dev/null
+++ b/.gitlab-ci/build-fossilize.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -ex
+
+git clone https://github.com/ValveSoftware/Fossilize.git
+cd Fossilize
+git checkout 6b5b570008c9ab5269e341f04c811fe49a1bb72c
+git submodule update --init
+mkdir build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -G Ninja
+ninja -C . -j4 install
+cd ../..
+rm -rf Fossilize
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index a2ae583a65e..416adece99e 100644
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -72,6 +72,10 @@ apt-get install -y --no-remove \
 
 . .gitlab-ci/build-cts-runner.sh
 
+############### Build Fossilize
+
+. .gitlab-ci/build-fossilize.sh
+
 ############### Build dEQP VK
 
 . .gitlab-ci/build-deqp-vk.sh