From ba5ece803dc5019dee13acd89e4943dcc62fb540 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 13 Nov 2022 02:03:44 +0200 Subject: [PATCH 19/19] CI: Build Qt-components on mac-meson See osdn #45996 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 3 ++- scripts/ci-build.sh | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6296685a66..5a39842f31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,7 +97,8 @@ jobs: sdl2_mixer \ sdl2_gfx \ sdl2_image \ - sdl2_ttf + sdl2_ttf \ + qt@6 - name: build shell: bash run: ./scripts/ci-build.sh mac-meson diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index d764a18c49..7774b7d833 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -94,10 +94,10 @@ cd build meson .. \ -Dack_experimental=true \ -Ddebug=true \ - -Druledit=false \ + -Druledit=true \ -Dsyslua=true \ - -Dclients=gtk3.22,sdl2,gtk4 \ - -Dfcmp=gtk3,gtk4,cli \ + -Dclients=gtk3.22,sdl2,gtk4,qt \ + -Dfcmp=gtk3,gtk4,qt,cli \ -Dprefix=${HOME}/freeciv/mac-meson \ || (let meson_exit_status=$? \ && echo "meson.log:" \ -- 2.35.1