diff options
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | .gitlab-ci/build-deqp-vk.sh | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00f5516d2ad..a99363bcfe8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -237,7 +237,7 @@ x86_test-gl: x86_test-vk: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-02" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-02-new-vk-cts" # Debian 9 based x86 build image (old LLVM) x86_build_old: diff --git a/.gitlab-ci/build-deqp-vk.sh b/.gitlab-ci/build-deqp-vk.sh index 206ac0109a1..4751ebfcd55 100644 --- a/.gitlab-ci/build-deqp-vk.sh +++ b/.gitlab-ci/build-deqp-vk.sh @@ -2,13 +2,18 @@ set -ex +git config --global user.email "[email protected]" +git config --global user.name "Mesa CI" git clone \ - --depth 1 \ https://github.com/KhronosGroup/VK-GL-CTS.git \ - -b vulkan-cts-1.2.1.0 \ + -b vulkan-cts-1.2.2.1 \ /VK-GL-CTS pushd /VK-GL-CTS +# Cherry pick a fix that's not in 1.2.2.1 yet. Re-add --depth 1 to the clone +# when an uprev removes this. +git cherry-pick -x ea6f1ffae14de94bbd9c354ad5a6c3f452f65ac4 + # --insecure is due to SSL cert failures hitting sourceforge for zlib and # libpng (sigh). The archives get their checksums checked anyway, and git # always goes through ssh or https. |