From 93fcc9ad57a7e0e64ae45988e62b24563ff9fdc3 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 26 Feb 2020 09:32:41 +0100 Subject: [PATCH] gitlab-ci: build Fossilize in the test image for VK MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuel Pitoiset Reviewed-by: Michel Dänzer Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/build-fossilize.sh | 14 ++++++++++++++ .gitlab-ci/container/x86_test-vk.sh | 4 ++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 .gitlab-ci/build-fossilize.sh 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 -- 2.30.2