From db276c90feede4d85c3bde38d766447cc6091a39 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 2 Jul 2022 22:06:17 +0300 Subject: [PATCH 48/48] CI: Make msys2 installers with meson Build installers that already can be built with it, with Makefile.meson, rest still with Makefile (autotools) See osdn #44912 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 3 ++- windows/installer_msys2/Makefile | 2 +- windows/installer_msys2/Makefile.meson | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a719d15c92..b9d3f2337d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,7 @@ jobs: automake1.16 libtool autoconf + mingw-w64-x86_64-meson mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-icu @@ -47,7 +48,7 @@ jobs: shell: msys2 {0} run: | cd windows/installer_msys2 - make ci + make ci && EXTRA_CONFIG="-Dack_experimental=true" make -f Makefile.meson ci os_x: runs-on: macos-12 steps: diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index e68334b773..d8bc28ca62 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -98,7 +98,7 @@ snapshot: ci: cd ../.. ; ./autogen.sh --no-configure-run - make VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" gtk3.22-installer sdl2-installer ruledit-installer-qt6 qt6-installer + make VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"$$CXXFLAGS\\\"" ruledit-installer-qt6 qt6-installer # configure Freeciv diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index c143355498..c19fa0049e 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -37,6 +37,9 @@ all: gtk3.22-installer sdl2-installer 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 + gtk3.22-installer: make -f Makefile.meson GUI=gtk3.22 CLIENT=gtk3.22 FCMP=gtk3 installer-common -- 2.35.1