gitlab-ci: Use Debian 10 wine-development packages

They're version 4.2, new enough for the MinGW job tests to pass.

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5296>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2343ed..f8c45fe 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,7 +137,7 @@ x86_build:
     - .fdo.container-build@debian
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_build "2020-05-29"
+    FDO_DISTRIBUTION_TAG: &x86_build "2020-05-31"
 
 .use-x86_build:
   variables:
@@ -570,7 +570,7 @@ meson-s390x:
   script:
     # For unknown reasons "too many" installed i386 libraries cause qemu to
     # crash while executing llvm-config for s390x.
-    - apt-get purge -y wine32
+    - apt-get purge -y wine32-development
     - apt-get autoremove -y --purge
     - dpkg -i /var/cache/apt/archives/$CROSS/*.deb
     - .gitlab-ci/meson-build.sh

diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh
index fe8eb33..253948b 100644 (file)
--- a/.gitlab-ci/container/x86_build.sh
+++ b/.gitlab-ci/container/x86_build.sh
@@ -83,6 +83,9 @@ apt-get install -y --no-remove \
       python3-requests \
       qemu-user \
       scons \
+      wine-development \
+      wine32-development \
+      wine64-development \
       x11proto-dri2-dev \
       x11proto-gl-dev \
       x11proto-randr-dev \
@@ -128,10 +131,7 @@ apt-get install -y -t testing \
 
 apt-get install -y --no-remove -t testing \
       g++-mingw-w64-x86-64-win32 \
-      libz-mingw-w64-dev \
-      wine \
-      wine32 \
-      wine64
+      libz-mingw-w64-dev
 
 
 . .gitlab-ci/container/container_pre_build.sh