From 4a6a046f0f2a2402d2c777c12554cd1d77402326 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 22 Nov 2022 05:51:55 +0200 Subject: [PATCH 26/26] CI: Update setup-msys2 to version 2.14.0 See osdn #46037 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- windows/installer_msys2/Makefile.autotools | 3 +-- 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 f20916b466..3220f24200 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/master/CHANGELOG.md - # 2.13.0 provides msys2 snapshot 20220904 - uses: msys2/setup-msys2@v2.13.0 + # 2.14.0 provides msys2 snapshot 20221101 + uses: msys2/setup-msys2@v2.14.0 with: install: > make diff --git a/windows/installer_msys2/Makefile.autotools b/windows/installer_msys2/Makefile.autotools index 0bef564d81..659e185abd 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/windows/installer_msys2/Makefile.autotools @@ -50,6 +50,7 @@ endif MAGICKVER=7.Q16HDRI-10 FFIVER=8 +ICUVER=72 INSTSUB=${ARCHDIR} @@ -57,9 +58,7 @@ INSTSUB=${ARCHDIR} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -ICUVER=71 else -ICUVER=72 endif # diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index 7b13994dab..7b3dc6a16f 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -37,14 +37,13 @@ endif MAGICKVER=7.Q16HDRI-10 FFIVER=8 +ICUVER=72 # msys2 has dlls in... DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -ICUVER=71 else -ICUVER=72 endif # -- 2.35.1