From efbfc944b6fb2bde516cbf470be8000110e78cdf Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 22 Nov 2022 05:53:40 +0200 Subject: [PATCH 23/23] 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 | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a39842f31..87b0ed28ef 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 b/windows/installer_msys2/Makefile index 4e0ca5186f..50369fb7df 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -48,6 +48,7 @@ endif MAGICKVER=7.Q16HDRI-10 FFIVER=8 +ICUVER=72 INSTSUB=${ARCHDIR} @@ -55,9 +56,7 @@ INSTSUB=${ARCHDIR} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -ICUVER=71 else -ICUVER=72 endif # -- 2.35.1