gitlab-ci: add missing popd to the build-deqp-vk.sh script

Since we are at it, replace "cd" with pushd / popd and homogenize how
VK-GL-CTS is built in comparison with other build scripts.

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94fa88301697ca7b9e15b317e8aaeac922f48b3e..700e8a1d5a0f591ad4e8f1dec148c1a13ade9c19 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,7 +131,7 @@ x86_test-gl:
 x86_test-vk:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test-vk "2020-01-14"
+    DEBIAN_TAG: &x86_test-vk "2020-02-01"
   # 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-cts-runner.sh b/.gitlab-ci/build-cts-runner.sh
index cd6c6adbce73612e79061864fe32a4429c78647c..982e734d73fea24bbaa2ca22cee485c8fa694fa5 100644 (file)
--- a/.gitlab-ci/build-cts-runner.sh
+++ b/.gitlab-ci/build-cts-runner.sh
@@ -2,9 +2,9 @@
 
 set -ex
 
-git clone https://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git --depth 1 -b mesa-ci-2019-12-17
-cd parallel-deqp-runner
+git clone https://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git --depth 1 -b mesa-ci-2019-12-17 /parallel-deqp-runner
+pushd /parallel-deqp-runner
 meson build/ $EXTRA_MESON_ARGS
 ninja -C build -j4 install
-cd ..
-rm -rf parallel-deqp-runner
+popd
+rm -rf /parallel-deqp-runner

diff --git a/.gitlab-ci/build-deqp-vk.sh b/.gitlab-ci/build-deqp-vk.sh
index 0ecca19b951e87cf2113ef0c215572197bce5774..16db188384391df6c1e4182e71178e272eb22ca2 100644 (file)
--- a/.gitlab-ci/build-deqp-vk.sh
+++ b/.gitlab-ci/build-deqp-vk.sh
@@ -1,8 +1,13 @@
-git clone --depth 1 \
+#!/bin/bash
+
+set -ex
+
+git clone \
+    --depth 1 \
     https://github.com/KhronosGroup/VK-GL-CTS.git \
     -b vulkan-cts-1.1.6.0 \
     /VK-GL-CTS
-cd /VK-GL-CTS
+pushd /VK-GL-CTS
 
 # --insecure is due to SSL cert failures hitting sourceforge for zlib and
 # libpng (sigh).  The archives get their checksums checked anyway, and git
@@ -10,7 +15,10 @@ cd /VK-GL-CTS
 python3 external/fetch_sources.py --insecure
 
 mkdir -p /deqp
-cd /deqp
+
+popd
+
+pushd /deqp
 cmake -G Ninja \
       -DDEQP_TARGET=x11_glx \
       -DCMAKE_BUILD_TYPE=Release \
@@ -31,3 +39,4 @@ find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs r
 strip external/vulkancts/modules/vulkan/deqp-vk
 du -sh *
 rm -rf /VK-GL-CTS
+popd