From: Mika T. Lindqvist <postmaster@raasu.org>
Date: Tue, 15 Mar 2022 16:33:17 +0000 (+0200)
Subject: Explicitly install dependencies for wine32.
X-Git-Tag: 2.1.0-beta1~332
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=276a3ec3b3d9096b408726ff0da04d70cfe1f6f3;p=thirdparty%2Fzlib-ng.git

Explicitly install dependencies for wine32.
* Allow downgrading packages to resolve conflicts
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 3b6ac222..b37c84d3 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -259,7 +259,7 @@ jobs:
           - name: Ubuntu MinGW i686
             os: ubuntu-latest
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-mingw-i686.cmake
-            packages: wine32 gcc-mingw-w64-i686 g++-mingw-w64-i686
+            packages: wine32 gcc-mingw-w64-i686 g++-mingw-w64-i686 libpcre2-8-0=10.34-7 libpcre2-8-0:i386=10.34-7 libodbc1=2.3.6-0.1build1 libodbc1:i386=2.3.6-0.1build1
             ldflags: -static
             codecov: ubuntu_gcc_mingw_i686
             # Limit parallel test jobs to prevent wine errors
@@ -417,13 +417,12 @@ jobs:
       if: contains(matrix.packages, 'wine')
       run: |
         sudo dpkg --add-architecture i386
-        sudo apt-add-repository ppa:ondrej/php -y
 
     - name: Install packages (Ubuntu)
       if: runner.os == 'Linux' && matrix.packages
       run: |
         sudo apt-get update
-        sudo apt-get install -y ${{ matrix.packages }}
+        sudo apt-get install -y --allow-downgrades ${{ matrix.packages }}
 
     - name: Install packages (Windows)
       if: runner.os == 'Windows'