From: Simon McVittie <smcv@collabora.com>
Date: Mon, 12 Sep 2022 17:13:48 +0000 (+0100)
Subject: CI: Don't pin msys2 packages to a specific version at all
X-Git-Tag: dbus-1.15.0~11^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb38fb361ebed7fbb1ad6fe244ac403f6b0a31d9;p=thirdparty%2Fdbus.git

CI: Don't pin msys2 packages to a specific version at all

Similar to dbus/dbus!286, but more so: just use the package names,
ignoring their version numbers completely.

pcre2 is not strictly needed at the moment, but it'll be a dependency
for GLib >= 2.73.x (older versions used pcre). For a bit of
future-proofing, download both pcre and pcre2.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/tools/ci-install.sh b/tools/ci-install.sh
index a82aa1bc9..c53ede9bb 100755
--- a/tools/ci-install.sh
+++ b/tools/ci-install.sh
@@ -368,7 +368,8 @@ esac
 if [ "$ci_local_packages" = yes ]; then
     case "$ci_host" in
         (*-w64-mingw32)
-            mirror=https://repo.msys2.org/mingw/${ci_host%%-*}
+            cpu="${ci_host%%-*}"
+            mirror="https://repo.msys2.org/mingw/$cpu"
             dep_prefix=$(pwd)/${ci_host}-prefix
             # clean install dir, if present
             rm -rf ${dep_prefix}
@@ -376,20 +377,21 @@ if [ "$ci_local_packages" = yes ]; then
             wget -O files.lst ${mirror}
             sed 's,^<a href=",,g;s,">.*$,,g' files.lst | grep -v "\.db" | grep -v "\.files" | grep ".*zst$" | sort > filenames.lst
             packages=(
-                bzip2-1.0
-                expat-2.2
-                gcc-libs-10.2
-                gettext-0.19
-                glib2-2.66
-                iconv-1.16
-                libffi-3.3
-                libiconv-1.16
-                libwinpthread-git-8.0.0
-                pcre-8.44
-                zlib-1.2
+                bzip2
+                expat
+                gcc-libs
+                gettext
+                glib2
+                iconv
+                libffi
+                libiconv
+                libwinpthread-git
+                pcre
+                pcre2
+                zlib
             )
             for pkg in "${packages[@]}" ; do
-                filename=$(grep ${pkg} filenames.lst | tail -1)
+                filename=$(grep -F "mingw-w64-${cpu}-${pkg}-" filenames.lst | tail -1)
                 if [ -z ${filename} ]; then
                     echo "could not find filename for package '${pkg}'"
                     exit 1