diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-09-12 18:13:48 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-09-13 16:08:36 +0100 |
| commit | 99fa277774d62ddaa6481e1dcb5c72ab0e1ea3b2 (patch) | |
| tree | 4e390b54d9b6928083739af2a0e1704f63aa6acd | |
| parent | 182eafb3a20df121a7201cde8b7f5a6efb993b59 (diff) | |
| download | dbus-99fa277774d62ddaa6481e1dcb5c72ab0e1ea3b2.tar.gz | |
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>
(cherry picked from commit 8aa34131dd3665df1c0d6a2c92600e04593d09c0)
| -rwxr-xr-x | tools/ci-install.sh | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/tools/ci-install.sh b/tools/ci-install.sh index ac0ae95d..7dcf5885 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -193,7 +193,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} @@ -201,20 +202,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 |