summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2021-01-10 22:54:43 +0400
committerSimon McVittie <smcv@collabora.com>2022-02-25 14:17:01 +0000
commit029a0adf4b046e8cfb6b9ea43dfc1af678fe6b18 (patch)
tree7855a8a4e0f670d86bb16055ad31f886ee718fa2
parent1701d9f1a69bff2ba074aa314a181f5b019ad0f1 (diff)
downloaddbus-029a0adf4b046e8cfb6b9ea43dfc1af678fe6b18.tar.gz
ci: bump msys2 deps, fix broken links
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> (cherry picked from commit c5385dfd60ac7ca64c6742d33dd82688769805fe)
-rwxr-xr-xtools/ci-install.sh27
1 files changed, 14 insertions, 13 deletions
diff --git a/tools/ci-install.sh b/tools/ci-install.sh
index d66eabe1..0c83bf47 100755
--- a/tools/ci-install.sh
+++ b/tools/ci-install.sh
@@ -186,6 +186,7 @@ case "$ci_distro" in
xmlto
xsltproc
xvfb
+ zstd
)
case "$ci_suite" in
@@ -242,21 +243,21 @@ if [ "$ci_local_packages" = yes ]; then
dep_prefix=$(pwd)/${ci_host}-prefix
install -d "${dep_prefix}"
packages=(
- bzip2-1.0.8-1
- expat-2.2.9-1
- gcc-libs-9.3.0-2
- gettext-0.19.8.1-8
- glib2-2.64.2-1
- iconv-1.16-1
- libffi-3.3-1
- libiconv-1.16-1
- libwinpthread-git-8.0.0.5814.9dbf4cc1-1
- pcre-8.44-1
- zlib-1.2.11-7
+ bzip2-1.0.8-2
+ expat-2.2.10-1
+ gcc-libs-10.2.0-6
+ gettext-0.19.8.1-10
+ glib2-2.66.4-1
+ iconv-1.16-2
+ libffi-3.3-2
+ libiconv-1.16-2
+ libwinpthread-git-8.0.0.5906.c9a21571-1
+ pcre-8.44-2
+ zlib-1.2.11-8
)
for pkg in "${packages[@]}" ; do
- wget ${mirror}/mingw-w64-${ci_host%%-*}-${pkg}-any.pkg.tar.xz
- tar -C ${dep_prefix} --strip-components=1 -xvf mingw-w64-${ci_host%%-*}-${pkg}-any.pkg.tar.xz
+ wget ${mirror}/mingw-w64-${ci_host%%-*}-${pkg}-any.pkg.tar.zst
+ tar -C ${dep_prefix} --strip-components=1 -xvf mingw-w64-${ci_host%%-*}-${pkg}-any.pkg.tar.zst
done
# limit access rights