From 7d1f65d796507e2d5ae2dcceb50b86f9ed855cd5 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 9 Dec 2021 02:49:45 +0200 Subject: [PATCH] CI: Update setup-msys2 to version 2.7.0 See osdn #43356 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- windows/installer_msys2/Makefile | 14 +++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a60e9870f..f9213d41dc 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.6.1 provides msys2 snapshot 20210725 - uses: msys2/setup-msys2@v2.6.1 + # 2.7.0 provides msys2 snapshot 20211130 + uses: msys2/setup-msys2@v2.7.0 with: install: > make diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index ff0556fbed..720252af63 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -36,15 +36,7 @@ else QT6_MOCCMD="$(MOCCMD)" endif -ifeq ($(CI),yes) -ICUVER=68 -LERC= -MD4C= -else ICUVER=69 -LERC=libLerc.dll -MD4C=libmd4c.dll -endif INSTSUB=${ARCHDIR} @@ -352,7 +344,7 @@ SDL2_DLLS := \ libzstd.dll \ libdeflate.dll \ libjbig-0.dll \ - ${LERC} + libLerc.dll install-env-sdl2: install-env-gtk4-fcmp # add DLLs @@ -376,7 +368,7 @@ QT5_DLLS := \ libbrotlicommon.dll \ libdouble-conversion.dll \ libzstd.dll \ - ${MD4C} + libmd4c.dll install-env-qt5: install-env-common # add DLLs @@ -455,7 +447,7 @@ RULEDIT_QT5_DLLS := \ libraqm-0.dll \ libexpat-1.dll \ libfribidi-0.dll \ - ${MD4C} + libmd4c.dll install-env-ruledit-qt5: # add DLLs -- 2.33.0