From 746110547256422e615d7b520f8b1a135b2ffd88 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 16 Feb 2022 17:00:38 +0200 Subject: [PATCH 51/51] CI: Build Qt6-client installer for Msys2 See osdn #43878 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 1 + windows/installer_msys2/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e26568472f..f47015d679 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,7 @@ jobs: mingw-w64-x86_64-gtk3 mingw-w64-x86_64-gtk4 mingw-w64-x86_64-qt5 + mingw-w64-x86_64-qt6-base mingw-w64-x86_64-SDL2_image mingw-w64-x86_64-SDL2_ttf mingw-w64-x86_64-SDL2_gfx diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index a6c6af8d5c..ea888ab557 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -85,7 +85,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=\\\"-Werror $$CXXFLAGS\\\"" all + make VERSION_REVTYPE="git" CI=yes EXTRA_CONFIG="--enable-gitrev --with-project-definition=../../../bootstrap/snapshot.project CFLAGS=\\\"-Werror $$CFLAGS\\\" CXXFLAGS=\\\"-Werror $$CXXFLAGS\\\"" gtk3.22-installer sdl2-installer ruledit-installer qt6-installer # configure Freeciv -- 2.34.1