From b4cfba9d0261b52cf1bdd86abbc199098f23c2cb Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 12 May 2021 07:44:31 +0300 Subject: [PATCH 60/60] CI: Temporarily switch OSX build to use Qt5 OSX Qt6 build currently fails. Use Qt5 until that gets fixed. See osdn #42250 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 2 +- scripts/ci-build.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29f5221e37..3df2fede95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: sdl2_image \ sdl2_mixer \ sdl2_ttf \ - qt@6 + qt@5 - name: build shell: bash run: ./scripts/ci-build.sh os_x diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index f1e70d5316..c1ba690f06 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -39,16 +39,16 @@ ninja install "os_x") # gcc is an alias for clang on OS X -export PATH="/usr/local/opt/gettext/bin:/usr/local/opt/icu4c/bin:$(brew --prefix qt@6)/bin:$PATH" -export CPPFLAGS="-I/usr/local/opt/gettext/include -I/usr/local/opt/icu4c/include -I$(brew --prefix qt@6)/include $CPPFLAGS" -export LDFLAGS="-L/usr/local/opt/gettext/lib -L/usr/local/opt/icu4c/lib -L$(brew --prefix qt@6)/lib" +export PATH="/usr/local/opt/gettext/bin:/usr/local/opt/icu4c/bin:$(brew --prefix qt@5)/bin:$PATH" +export CPPFLAGS="-I/usr/local/opt/gettext/include -I/usr/local/opt/icu4c/include -I$(brew --prefix qt@5)/include $CPPFLAGS" +export LDFLAGS="-L/usr/local/opt/gettext/lib -L/usr/local/opt/icu4c/lib -L$(brew --prefix qt@5)/lib" export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH" mkdir build cd build ../autogen.sh --no-configure-run ../configure \ - --enable-sys-lua --with-qt6 \ + --enable-sys-lua \ --enable-client=gtk3.22,sdl2,qt \ --enable-freeciv-manual \ || (let config_exit_status=$? \ -- 2.30.2