diff options
| author | Andres Gomez <agomez@igalia.com> | 2020-04-22 16:51:48 +0300 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-04-24 20:01:31 +0000 |
| commit | cb055c6ca450768ded778e5a6797dd82b0a3d780 (patch) | |
| tree | a885752f02841f40fac128077c4b9c5c1adef8c3 /.gitlab-ci.yml | |
| parent | c8ccd63911dcec731d64c72a40ec6a3afe38eaa1 (diff) | |
gitlab-ci: install winehq-stable to get 5.0 instead of 4.0
Additionally, purge the winehq-stable package and its dependencies to
avoid crashing when building for s390x.
v2:
- Remove winehq-stable and dependencies for s390x.
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2657
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Daniel Stone <daniels@collabora.com> [v1]
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4678>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1087a734e4e..8de20ed8ef5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -133,7 +133,7 @@ x86_build: - .fdo.container-build@debian - .container variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-03-18-jflags" + FDO_DISTRIBUTION_TAG: &x86_build "2020-04-22-winehq" .use-x86_build: variables: @@ -548,7 +548,8 @@ meson-s390x: script: # For unknown reasons "too many" installed i386 libraries cause qemu to # crash while executing llvm-config for s390x. - - apt-get remove -y libglib2.0-0:i386 + - apt-get purge -y winehq-stable + - apt-get autoremove -y --purge - dpkg -i /var/cache/apt/archives/$CROSS/*.deb - .gitlab-ci/meson-build.sh |