fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 12:40:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci: Merge common builds in debian test jobs

Browse source 
Co-authored-by: Corentin Noël <corentin.noel@colabora.com>
Signed-off-by: Omar Akkila <omar.akkila@collabora.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15692>
This commit is contained in:
Omar Akkila 2021-07-28 17:42:33 +02:00 • committed by Tomeu Vizoso
parent 6915d1978a
commit 46ba0f0ffa
4 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci/container/debian/x86_test-base.sh
View file

@ -71,6 +71,14 @@ pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade9
. .gitlab-ci/container/build-deqp-runner.sh
rm -rf ~/.cargo
############### Build libdrm
. .gitlab-ci/container/build-libdrm.sh
############### Build Wayland
. .gitlab-ci/container/build-wayland.sh
apt-get purge -y $STABLE_EPHEMERAL
apt-get autoremove -y --purge

9
.gitlab-ci/container/debian/x86_test-gl.sh
View file

@ -24,7 +24,6 @@ STABLE_EPHEMERAL=" \
libclang-cpp13-dev \
libclang-cpp11-dev \
libelf-dev \
libexpat1-dev \
libfdt-dev \
libgbm-dev \
libgles2-mesa-dev \
@ -79,14 +78,6 @@ apt-get install -y --no-remove \
. .gitlab-ci/container/container_pre_build.sh
############### Build libdrm
. .gitlab-ci/container/build-libdrm.sh
############### Build Wayland
. .gitlab-ci/container/build-wayland.sh
############### Build Crosvm
. .gitlab-ci/container/build-rust.sh

8
.gitlab-ci/container/debian/x86_test-vk.sh
View file

@ -150,14 +150,6 @@ wine \
. .gitlab-ci/container/container_pre_build.sh
############### Build libdrm
. .gitlab-ci/container/build-libdrm.sh
############### Build Wayland
. .gitlab-ci/container/build-wayland.sh
############### Build parallel-deqp-runner's hang-detection tool
. .gitlab-ci/container/build-hang-detection.sh

8
.gitlab-ci/image-tags.yml
View file

@ -1,6 +1,6 @@
variables:
DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
DEBIAN_BASE_TAG: "2022-08-04-zstd"
DEBIAN_BASE_TAG: "2022-08-04-merge-common"
DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
DEBIAN_BUILD_TAG: "2022-08-04-zstd"
@ -11,11 +11,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-08-04-zstd"
DEBIAN_X86_TEST_VK_TAG: "2022-08-04-zstd"
DEBIAN_X86_TEST_GL_TAG: "2022-08-04-merge-common"
DEBIAN_X86_TEST_VK_TAG: "2022-08-04-merge-common"
FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5"
KERNEL_ROOTFS_TAG: "2022-08-04-zstd"
KERNEL_ROOTFS_TAG: "2022-08-04-virgl-update"
WINDOWS_X64_VS_PATH: "windows/x64_vs"
WINDOWS_X64_VS_TAG: "2022-06-15-vs-winsdk"