Mesa (master): gitlab-ci: Use Debian 10 wine-development packages
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Jun 2 18:41:14 UTC 2020
Module: Mesa
Branch: master
Commit: c964be0cd7ae7cded01430d3505edbbd803ddb3e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c964be0cd7ae7cded01430d3505edbbd803ddb3e
Author: Michel Dänzer <mdaenzer at redhat.com>
Date: Sun May 31 00:08:30 2020 +0200
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 at collabora.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5296>
---
.gitlab-ci.yml | 4 ++--
.gitlab-ci/container/x86_build.sh | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2343ed6e38..f8c45fe4196 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,7 +137,7 @@ x86_build:
- .fdo.container-build at 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 fe8eb33f01a..253948bc2d8 100644
--- 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
More information about the mesa-commit
mailing list