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 <mdaenzer@redhat.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18222>
This commit is contained in:
David Heidelberg 2022-08-24 01:38:07 +02:00 committed by Marge Bot
parent 4311d44260
commit b915c45cb9
2 changed files with 1 additions and 4 deletions

View file

@ -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

View file

@ -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"