From 350cb4011a729455a70be6f5b06cf33a5c60f927 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 20 Sep 2022 21:35:43 +0300 Subject: [PATCH 36/36] CI: Update setup-msys2 to version 2.13.0 See osdn #45608 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- windows/installer_msys2/Makefile | 10 +++------- windows/installer_msys2/Makefile.meson | 12 ++++-------- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be9d907615..c67dcd1ef9 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.12.0 provides msys2 snapshot 20220603 - uses: msys2/setup-msys2@v2.12.0 + # 2.13.0 provides msys2 snapshot 20220904 + uses: msys2/setup-msys2@v2.13.0 with: install: > make diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 9a45bc4a26..99a118853b 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -41,7 +41,9 @@ else QT6_MOCCMD="$(MOCCMD)" endif +ICUVER=71 MAGICKVER=7.Q16HDRI-10 +FFIVER=8 INSTSUB=${ARCHDIR} @@ -49,13 +51,7 @@ INSTSUB=${ARCHDIR} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -ICUVER=69 -FFIVER=7 -LIBJXL= else -ICUVER=71 -FFIVER=8 -LIBJXL=libjxl.dll endif # @@ -380,7 +376,7 @@ SDL2_DLLS := \ SDL2_image.dll \ SDL2_ttf.dll \ libzstd.dll \ - ${LIBJXL} \ + libjxl.dll \ libbrotlienc.dll install-env-sdl2: install-env-gtk4-fcmp diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index 2da32ebaeb..43f62cbcae 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -28,19 +28,15 @@ else error "Unsupported MSYSTEM environment" endif +ICUVER=71 MAGICKVER=7.Q16HDRI-10 +FFIVER=8 # msys2 has dlls in... DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -ICUVER=69 -FFIVER=7 -LIBJXL= else -ICUVER=71 -FFIVER=8 -LIBJXL=libjxl.dll endif # @@ -53,7 +49,7 @@ snapshot: make -f Makefile.meson VERSION_REVTYPE="git" EXTRA_CONFIG="-Dgitrev=true $(EXTRA_CONFIG)" all ci: - make -f Makefile.meson VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="-Dgitrev=true $(EXTRA_CONFIG)" gtk3.22-installer sdl2-installer gtk4-installer + make -f Makefile.meson VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="-Dgitrev=true -Dsys-tolua-cmd=true $(EXTRA_CONFIG)" gtk3.22-installer sdl2-installer gtk4-installer gtk3.22-installer: make -f Makefile.meson GUI=gtk3.22 CLIENT=gtk3.22 FCMP=gtk3 installer-common @@ -227,7 +223,7 @@ SDL2_DLLS := \ SDL2_ttf.dll \ libSDL2_gfx-1-0-0.dll \ SDL2_image.dll \ - ${LIBJXL} \ + libjxl.dll \ libbrotlienc.dll install-env-sdl2: install-env-gtk4-fcmp -- 2.35.1