From e19d6d35b801aca86644b58c9aa62559d3421369 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 28 Oct 2023 23:08:37 +0300 Subject: [PATCH 26/26] CI: Update setup-msys2 to version 2.21.0 See osdn #48911 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- platforms/windows/installer_msys2/Makefile.autotools | 3 +-- platforms/windows/installer_msys2/Makefile.meson | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a1d9b8fee..e031cb2b2c 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.20.1 provides msys2 snapshot 20230718 - uses: msys2/setup-msys2@v2.20.1 + # 2.21.0 provides msys2 snapshot 20231026 + uses: msys2/setup-msys2@v2.21.0 with: msystem: UCRT64 install: > diff --git a/platforms/windows/installer_msys2/Makefile.autotools b/platforms/windows/installer_msys2/Makefile.autotools index 8744c2ec0c..e23b1d52c9 100644 --- a/platforms/windows/installer_msys2/Makefile.autotools +++ b/platforms/windows/installer_msys2/Makefile.autotools @@ -71,6 +71,7 @@ endif MAGICKVER=7.Q16HDRI-10 FFIVER=8 CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} +ICUVER=73 INSTSUB=${ARCHDIR} @@ -78,9 +79,7 @@ INSTSUB=${ARCHDIR} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -ICUVER=72 else -ICUVER=73 endif # diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index 71933b3c2c..3cbdd650f4 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -66,14 +66,13 @@ endif MAGICKVER=7.Q16HDRI-10 FFIVER=8 CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} +ICUVER=73 # msys2 has dlls in... DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -ICUVER=72 else -ICUVER=73 endif # -- 2.42.0