Module: Mesa Branch: main Commit: b915c45cb9b5fd487e8a2cfe0d570de20439c88e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b915c45cb9b5fd487e8a2cfe0d570de20439c88e
Author: David Heidelberg <[email protected]> Date: Wed Aug 24 01:38:07 2022 +0200 ci: drop last bits of wine32 This allows us droping i386 subarchitecture, which leads to saving about 100 MiB from the base image. v2: - dropped DEBIAN_BUILD_TAG and DEBIAN_BUILD_MINGW_TAG change, since DEBIAN_BASE_TAG is enough Reviewed-by: Michel Dänzer <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18222> --- .gitlab-ci/container/debian/x86_build-base-wine.sh | 3 --- .gitlab-ci/image-tags.yml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_build-base-wine.sh b/.gitlab-ci/container/debian/x86_build-base-wine.sh index dec8f790cf4..3e143ac54f6 100644 --- a/.gitlab-ci/container/debian/x86_build-base-wine.sh +++ b/.gitlab-ci/container/debian/x86_build-base-wine.sh @@ -5,12 +5,9 @@ set -o xtrace # Installing wine, need this for testing mingw or nine -# We need multiarch for Wine -dpkg --add-architecture i386 apt-get update apt-get install -y --no-remove \ wine \ - wine32 \ wine64 \ xvfb diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index b43811543f9..20c9a8e7364 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2022-08-25-shellcheck" + DEBIAN_BASE_TAG: "2022-08-27-drop-wine32" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2022-08-25-shellcheck"
