From 83e9b46277048aa08efbade9fb439fb4f4b25a7c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 18 Feb 2023 21:24:42 +0200 Subject: [PATCH 27/27] CI: Update setup-msys2 to version 2.16.0 See osdn #47383 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- windows/installer_msys2/Makefile | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e6cf7b23b..2394d19934 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.15.1 provides msys2 snapshot 20221216 - uses: msys2/setup-msys2@v2.15.1 + # 2.16.0 provides msys2 snapshot 20230127 + uses: msys2/setup-msys2@v2.16.0 with: install: > make diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 98122e373b..40f89d3e30 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -64,9 +64,11 @@ INSTSUB=${ARCHDIR} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -TIFF=libtiff-5.dll +CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} +CERTPATH=/etc else -TIFF=libtiff-6.dll +CRYPTOVERSUF=1_1${CRYPTOLIB_SUFFIX} +CERTPATH= endif # @@ -267,9 +269,9 @@ SOUND_DLLS := \ COMMON_DLLS := \ libstdc++-6.dll \ - libcrypto-1_1${CRYPTOLIB_SUFFIX}.dll \ + libcrypto-${CRYPTOVERSUF}.dll \ libpsl-5.dll \ - libssl-1_1${CRYPTOLIB_SUFFIX}.dll \ + libssl-${CRYPTOVERSUF}.dll \ libidn2-0.dll \ libnghttp2-14.dll \ libssh2-1.dll \ @@ -330,7 +332,7 @@ install-env-common: # add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) install-$(WINARCH)-$(GUI)/ mkdir -p install-$(WINARCH)-$(GUI)/ssl/certs - cp -R /$(ARCHDIR)/ssl/certs/ca-bundle.crt install-$(WINARCH)-$(GUI)/ssl/certs/ + cp -R /$(ARCHDIR)$(CERTPATH)/ssl/certs/ca-bundle.crt install-$(WINARCH)-$(GUI)/ssl/certs/ DEFAULT_FCMP_DLLS := \ libgdk-3-0.dll \ @@ -374,7 +376,7 @@ GTK4_FCMP_DLLS := \ liblzo2-2.dll \ libgraphite2.dll \ libdatrie-1.dll \ - $(TIFF) \ + libtiff-6.dll \ libjpeg-8.dll \ libLerc.dll \ libwebp-7.dll \ @@ -457,9 +459,9 @@ install-env-qt6: install-env-common RULEDIT_QT5_DLLS := \ libstdc++-6.dll \ - libcrypto-1_1${CRYPTOLIB_SUFFIX}.dll \ + libcrypto-${CRYPTOVERSUF}.dll \ libpsl-5.dll \ - libssl-1_1${CRYPTOLIB_SUFFIX}.dll \ + libssl-${CRYPTOVERSUF}.dll \ libidn2-0.dll \ libnghttp2-14.dll \ libssh2-1.dll \ @@ -515,9 +517,9 @@ install-env-ruledit-qt5: RULEDIT_QT6_DLLS := \ libstdc++-6.dll \ - libcrypto-1_1${CRYPTOLIB_SUFFIX}.dll \ + libcrypto-${CRYPTOVERSUF}.dll \ libpsl-5.dll \ - libssl-1_1${CRYPTOLIB_SUFFIX}.dll \ + libssl-${CRYPTOVERSUF}.dll \ libidn2-0.dll \ libnghttp2-14.dll \ libssh2-1.dll \ -- 2.39.1