From cf8ab452453e8ea9c168ce69f98ee505e6f34235 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 27 Dec 2025 18:51:15 +0200 Subject: [PATCH 26/26] CI: Update setup-msys2 to version 2.30.0 See RM #1818 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- windows/installer_msys2/Makefile.meson | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 264f8a2275..517748b1d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,8 @@ jobs: # A mapping from msys2/setup-msys2 version to msys2 version can be # found at # https://github.com/msys2/setup-msys2/blob/main/CHANGELOG.md - # 2.29.0 provides msys2 snapshot 20250830 - uses: msys2/setup-msys2@v2.29.0 + # 2.30.0 provides msys2 snapshot 20251213 + uses: msys2/setup-msys2@v2.30.0 with: msystem: UCRT64 install: > diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index 83e8ba7013..3f8ae29567 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -72,13 +72,15 @@ CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -ICUVER=77 +ICUVER=78 RAV1E=librav1e.dll SVTAV1ENV=libSvtAv1Enc-3.dll +XML2=libxml2-16.dll else ICUVER=75 RAV1E=rav1e.dll SVTAV1ENV=libSvtAv1Enc-2.dll +XML2=libxml2-2.dll endif # @@ -256,7 +258,7 @@ COMMON_DLLS := \ liblcms2-2.dll \ liblqr-1-0.dll \ libltdl-7.dll \ - libxml2-2.dll \ + $(XML2) \ libraqm-0.dll \ libunistring-5.dll \ exchndl.dll \ -- 2.51.0