From 37a2fca0ae21b0a9b85bb3984f2d211235634ac7 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 27 Dec 2025 14:28:20 +0200 Subject: [PATCH 49/49] CI: Update setup-msys2 to version 2.30.0 See RM #1818 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- platforms/windows/installer_msys2/Makefile.meson | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9237fe9079..ea279f192a 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/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index 2497aba901..116e669d29 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -53,7 +53,7 @@ CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -ICUVER=77 +ICUVER=78 else ICUVER=77 endif -- 2.51.0