From 6239f3971b27046dd764b7451077635868d36383 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 4 Jun 2022 13:53:54 +0300 Subject: [PATCH 18/18] CI: Make autotools builds on ubuntu runner in Qt6-mode See osdn #44662 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 6 +++--- scripts/ci-build.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f91f128f3..d43a97f844 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,7 @@ jobs: liblzma-dev \ libicu-dev \ libsqlite3-dev \ - qtbase5-dev \ + qt6-base-dev \ libsdl2-mixer-dev \ libsdl2-gfx-dev \ libsdl2-image-dev \ @@ -130,7 +130,7 @@ jobs: libicu-dev \ libsqlite3-dev \ libgtk-3-dev \ - qtbase5-dev \ + qt6-base-dev \ libsdl2-mixer-dev \ libsdl2-gfx-dev \ libsdl2-image-dev \ @@ -195,7 +195,7 @@ jobs: liblzma-dev \ libicu-dev \ libsqlite3-dev \ - qtbase5-dev \ + qt6-base-dev \ libsdl2-mixer-dev \ libsdl2-gfx-dev \ libsdl2-image-dev \ diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 8bb9012638..ec0e445225 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -29,7 +29,7 @@ echo "Freeciv distribution check successful!" ;; "meson") -FC_MESON_VER="0.57.2" +FC_MESON_VER="" if test "$FC_MESON_VER" != "" ; then mkdir meson-install cd meson-install @@ -86,7 +86,7 @@ cd build --enable-sys-lua \ --enable-sys-tolua-cmd \ --disable-fcdb \ - --with-qt5 \ + --with-qtver=qt6 \ --enable-client=gtk3.22,gtk3,qt,sdl2,stub \ --enable-fcmp=cli,gtk3,qt \ --enable-freeciv-manual \ @@ -110,7 +110,7 @@ cd build ../autogen.sh \ CFLAGS="-O3" \ CXXFLAGS="-O3" \ - --with-qt5 \ + --with-qtver=qt6 \ --enable-client=gtk3.22,gtk3,qt,sdl2,stub \ --enable-fcmp=cli,gtk3,qt \ --enable-freeciv-manual \ -- 2.35.1