Module: Mesa Branch: master Commit: 3d3f21f0be49ccb6af32d1691734e868d6b2c493 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d3f21f0be49ccb6af32d1691734e868d6b2c493
Author: Andres Gomez <[email protected]> Date: Wed Feb 17 18:23:30 2021 +0200 ci: add libdrm to the x86_test-vk container Fixes: 5d0ba8b1834 (ci: Split building of libdrm to its own script) Signed-off-by: Andres Gomez <[email protected]> Reviewed-by: Tomeu Vizoso <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9102> --- .gitlab-ci.yml | 2 +- .gitlab-ci/container/x86_test-vk.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eaf56173152..4d2c854fbda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -413,7 +413,7 @@ x86_test-gl: x86_test-vk: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-vk "2021-02-17-gfxreconstruct-master" + MESA_IMAGE_TAG: &x86_test-vk "2021-02-18-add-libdrm" # Debian 10 based ARM build image arm_build: diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh index 6c1923eedcd..7d41fa78c75 100644 --- a/.gitlab-ci/container/x86_test-vk.sh +++ b/.gitlab-ci/container/x86_test-vk.sh @@ -13,6 +13,7 @@ STABLE_EPHEMERAL=" \ libgbm-dev \ libgles2-mesa-dev \ liblz4-dev \ + libpciaccess-dev \ libpng-dev \ libvulkan-dev \ libwaffle-dev \ @@ -28,6 +29,7 @@ STABLE_EPHEMERAL=" \ pkg-config \ python3-distutils \ wget \ + xz-utils \ " apt-get install -y --no-remove \ @@ -127,6 +129,10 @@ rm -rf /root/.rustup /root/.cargo . .gitlab-ci/container/build-gfxreconstruct.sh +############### Build libdrm + +. .gitlab-ci/container/build-libdrm.sh + ############### Uninstall the build software ccache --show-stats _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
