From: Simon McVittie <smcv@collabora.com>
Date: Thu, 27 Feb 2025 19:06:46 +0000 (+0000)
Subject: CI: Avoid hard-coding the version of Expat and GLib in use
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e116a3774a96fdc791f8eaac3c20991b9caf98e4;p=thirdparty%2Fdbus.git

CI: Avoid hard-coding the version of Expat and GLib in use

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

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 8752904d6..40c1598b0 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -214,12 +214,12 @@ case "$ci_host" in
             fi
             init_wine \
                 "${ci_builddir}/bin" \
-                "${ci_builddir}/subprojects/expat-2.4.8" \
-                "${ci_builddir}/subprojects/glib-2.72.2/gio" \
-                "${ci_builddir}/subprojects/glib-2.72.2/glib" \
-                "${ci_builddir}/subprojects/glib-2.72.2/gmodule" \
-                "${ci_builddir}/subprojects/glib-2.72.2/gobject" \
-                "${ci_builddir}/subprojects/glib-2.72.2/gthread" \
+                "${ci_builddir}"/subprojects/expat-* \
+                "${ci_builddir}"/subprojects/glib-*/gio \
+                "${ci_builddir}"/subprojects/glib-*/glib \
+                "${ci_builddir}"/subprojects/glib-*/gmodule \
+                "${ci_builddir}"/subprojects/glib-*/gobject \
+                "${ci_builddir}"/subprojects/glib-*/gthread \
                 "${dep_prefix}/bin" \
                 ${libgcc_path:+"$libgcc_path"}
         fi