From 9747caca4ede5958d5e62b1a78ab4b64d35fad55 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 8 Jun 2021 21:23:20 +0300 Subject: [PATCH 61/61] CI: Update setup-msys2 to version 2.3.1 See osdn #42495 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- windows/installer_msys2/Makefile | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9147c58433..3919506c44 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.3.0 provides msys2 snapshot 20210511 - uses: msys2/setup-msys2@v2.3.0 + # 2.3.1 provides msys2 snapshot 20210607 + uses: msys2/setup-msys2@v2.3.1 with: install: > make diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 1229f1f107..24fa938d10 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -147,16 +147,11 @@ install-ruledit-qt5: configure-freeciv-ruledit-qt5 install-ruledit-dir-qt5 # install Freeciv environment -ifeq ($(CI),yes) -COND_SOUND_DLLS=libfluidsynth-2.dll -else -COND_SOUND_DLLS=libfluidsynth-3.dll -endif - SOUND_DLLS := \ SDL2.dll \ SDL2_mixer.dll \ libFLAC-8.dll \ + libfluidsynth-3.dll \ libmodplug-1.dll \ libvorbis-0.dll \ libvorbisenc-2.dll \ @@ -231,7 +226,6 @@ COMMON_DLLS := \ install-env-common: # add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) install-$(WINARCH)-$(GUI)/ - cp -R $(addprefix $(DLLPATH_PREFIX), $(COND_SOUND_DLLS)) install-$(WINARCH)-$(GUI) mkdir -p install-$(WINARCH)-$(GUI)/ssl/certs cp -R /$(ARCHDIR)/ssl/certs/ca-bundle.crt install-$(WINARCH)-$(GUI)/ssl/certs/ -- 2.30.2