From 0e843833152fcb543333c41ec7494ee72f71dbbe Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 27 Mar 2022 07:42:08 +0300 Subject: [PATCH 42/42] CI: Update setup-msys2 to version 2.10.0 See osdn #44180 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- windows/installer_msys2/Makefile | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0384e37e0..e5fb4f7c25 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.9.0 provides msys2 snapshot 20220128 - uses: msys2/setup-msys2@v2.9.0 + # 2.10.0 provides msys2 snapshot 20220319 + uses: msys2/setup-msys2@v2.10.0 with: install: > make diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 3e50f057ac..b9ef4cf38e 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -37,7 +37,6 @@ QT6_MOCCMD="$(MOCCMD)" endif ICUVER=69 -MAGICKVER=7.Q16HDRI-7 INSTSUB=${ARCHDIR} @@ -45,11 +44,9 @@ INSTSUB=${ARCHDIR} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -FLAC="libFLAC-8.dll" -LIBB2="" +MAGICKVER=7.Q16HDRI-10 else -FLAC="libFLAC.dll" -LIBB2="libb2-1.dll" +MAGICKVER=7.Q16HDRI-7 endif # @@ -224,7 +221,7 @@ install-ruledit-qt6: configure-freeciv-ruledit-qt6 install-ruledit-dir-qt6 SOUND_DLLS := \ SDL2.dll \ SDL2_mixer.dll \ - $(FLAC) \ + libFLAC.dll \ libfluidsynth-3.dll \ libmodplug-1.dll \ libvorbis-0.dll \ @@ -414,7 +411,7 @@ QT6_DLLS := \ libgraphite2.dll \ libdouble-conversion.dll \ libmd4c.dll \ - $(LIBB2) + libb2-1.dll install-env-qt6: install-env-common # add DLLs -- 2.35.1