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 8752904d6a865b58e5b11dbb649f1caddb755437..40c1598b0e6b0457ba5a01ca10c3d1bacd0a3d45 100755 (executable)
--- 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