KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: cherry-pick deqp fix for zlib dependency 

Zlib was bumped to 1.2.12 breaking links to the previous 1.2.11.
Unfortunately, no tag currently carries the fix so cherry-pick it for
now.

Signed-off-by: Omar Akkila <omar.akkila@collabora.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15626>
This commit is contained in:
Omar Akkila 2022-03-28 22:23:23 -04:00 committed by Marge Bot
parent 803705425e
commit 4e4b411378
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/container/build-deqp.sh
View File

@ -11,6 +11,10 @@ git clone \
/VK-GL-CTS
pushd /VK-GL-CTS
# Cherry-pick fix for zlib dependency
git fetch origin main
git cherry-pick -x ec1804831b654ac55bd2a7a5dd27a556afe05030
# --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.

6
.gitlab-ci/image-tags.yml
View File

@ -8,11 +8,11 @@ variables:
DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
DEBIAN_X86_TEST_GL_TAG: "2022-03-25-virglrenderer"
DEBIAN_X86_TEST_VK_TAG: "2022-03-28-vkd3d-proton"
DEBIAN_X86_TEST_GL_TAG: "2022-03-29-deqp"
DEBIAN_X86_TEST_VK_TAG: "2022-03-29-deqp"
FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5"
KERNEL_ROOTFS_TAG: "2022-03-23-bash"
KERNEL_ROOTFS_TAG: "2022-03-29-deqp"
WINDOWS_X64_BUILD_PATH: "windows/x64_build"
WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split"