From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Thu, 9 Feb 2023 11:04:09 +0000 (+0100)
Subject: Narrow down the amount of packages installed for Wine.
X-Git-Tag: 2.1.0-beta1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d191cee37220a6972299ea3551de70593e2f16d9;p=thirdparty%2Fzlib-ng.git

Narrow down the amount of packages installed for Wine.
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index b0cde4246..b4b5897fd 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -276,7 +276,7 @@ jobs:
           - name: Ubuntu MinGW i686
             os: ubuntu-22.04
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-mingw-i686.cmake
-            packages: wine32 gcc-mingw-w64-i686 g++-mingw-w64-i686 libpcre2-8-0=10.39-3ubuntu0.1 libpcre2-8-0:i386=10.39-3ubuntu0.1 libodbc1=2.3.9-5 libodbc1:i386=2.3.9-5 libwine:i386=6.0.3~repack-1 libgphoto2-6:i386=2.5.27-1build2 libsane:i386=1.1.1-5 libgd3=2.3.0-2ubuntu2 libgd3:i386=2.3.0-2ubuntu2
+            packages: wine wine32 gcc-mingw-w64-i686 g++-mingw-w64-i686 libpcre2-8-0=10.39-3ubuntu0.1 libpcre2-8-0:i386=10.39-3ubuntu0.1 libodbc1=2.3.9-5 libodbc1:i386=2.3.9-5 libwine:i386=6.0.3~repack-1 libgphoto2-6:i386=2.5.27-1build2 libsane:i386=1.1.1-5 libgd3=2.3.0-2ubuntu2 libgd3:i386=2.3.0-2ubuntu2
             ldflags: -static
             codecov: ubuntu_gcc_mingw_i686
             # Limit parallel test jobs to prevent wine errors
@@ -285,7 +285,7 @@ jobs:
           - name: Ubuntu MinGW x86_64
             os: ubuntu-latest
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-mingw-x86_64.cmake
-            packages: wine-stable gcc-mingw-w64 g++-mingw-w64
+            packages: wine wine64 gcc-mingw-w64 g++-mingw-w64
             ldflags: -static
             codecov: ubuntu_gcc_mingw_x86_64
              # Limit parallel test jobs to prevent wine errors
@@ -485,7 +485,7 @@ jobs:
         path: test/data/corpora
 
     - name: Add repositories (Wine)
-      if: contains(matrix.packages, 'wine')
+      if: contains(matrix.packages, 'wine32')
       run: sudo dpkg --add-architecture i386
 
     - name: Add ubuntu mirrors
@@ -500,7 +500,7 @@ jobs:
       if: runner.os == 'Linux' && matrix.packages
       run: |
         sudo apt-get update
-        sudo apt-get install -y --allow-downgrades ${{ matrix.packages }}
+        sudo apt-get install -y --allow-downgrades --no-install-recommends ${{ matrix.packages }}
 
     - name: Install packages (Windows)
       if: runner.os == 'Windows'