[lmi-commits] [lmi] master 95c9f72 08/28: Use Debian Wine version in CI job

[Greg Chicares]

branch: master
commit 95c9f723cc0fe32e7899bffebe078ac14452329a
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Use Debian Wine version in CI job
    
    Prefer using the Debian version instead of the one from WineHQ for
    consistency with the local environments.
---
 .github/workflows/ci.yml | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e33ad99..4d76c62 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,7 +68,14 @@ jobs:
 
           if ${{ matrix.mingw }}
           then
-            packages="$packages g++-mingw-w64-i686"
+            packages="$packages g++-mingw-w64-i686 wine"
+
+            # This is additionally required when using 32-bit builds, currently
+            # do it unconditionally because our only MinGW build is 32 bits.
+            sudo dpkg --add-architecture i386
+            sudo apt-get -q -o=Dpkg::Use-Pty=0 update
+
+            packages="$packages wine32"
           else
             packages="$packages libunwind-dev libdw-dev libgtk-3-dev"
           fi
@@ -84,22 +91,6 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Install Wine
-        if: matrix.mingw
-        run: |
-          sudo dpkg --add-architecture i386
-
-          wget -qO - https://dl.winehq.org/wine-builds/winehq.key | sudo 
apt-key add -
-          sudo add-apt-repository "deb 
https://dl.winehq.org/wine-builds/debian $(lsb_release -cs) main"
-
-          sudo apt-get -qq update
-
-          # Workaround the issue with Wine.
-          sudo apt-get -qq install libasound2-plugins:i386 libgphoto2-6:i386
-          sudo apt-get -qq install wine-stable-i386
-          sudo apt-get -qq install wine-stable
-          sudo apt-get -qq install --install-recommends winehq-stable
-
       - name: System and environment setup
         run: |
           sudo sed -i'' -e 's/^int _putenv/_CRTIMP int _putenv/' 
/usr/share/libtool/build-aux/ltmain.sh