From 1d5d9e15e9d61e1636beb7c0663041655e2d68fc Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 25 Feb 2023 16:10:28 +0200 Subject: [PATCH] CI: Reinstall qt6 for mac builds before the builds Currently the initial install of ends as .reinstall directory Remove that, and install again, before actual build See osdn #47487 Signed-off-by: Marko Lindqvist --- scripts/ci-build.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index aff8f0b31e..b535f66b50 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -57,6 +57,11 @@ ninja install "os_x") # gcc is an alias for clang on OS X +# Workaround for current github issue: +# Remove failed qt6 installation attempt and reinstall +rm -Rf /usr/local/Cellar/*/*.reinstall +brew install qt@6 + export PATH="$(brew --prefix llvm)/bin:$(brew --prefix gettext)/bin:$(brew --prefix icu4c)/bin:$(brew --prefix qt@6)/bin:$(brew --prefix mysql-client)/bin:$PATH" export CPPFLAGS="-I$(brew --prefix gettext)/include -I$(brew --prefix icu4c)/include -I$(brew --prefix qt@6)/include -I$(brew --prefix readline)/include -I$(brew --prefix unixodbc)/include" export LDFLAGS="-L$(brew --prefix gettext)/lib -L$(brew --prefix icu4c)/lib -L$(brew --prefix qt@6)/lib -L$(brew --prefix readline)/lib -L$(brew --prefix unixodbc)/lib" @@ -92,6 +97,11 @@ echo "Freeciv server autogame successful!" "mac-meson") +# Workaround for current github issue: +# Remove failed qt6 installation attempt and reinstall +rm -Rf /usr/local/Cellar/*/*.reinstall +brew install qt@6 + export CPPFLAGS="-I$(brew --prefix readline)/include" export LDFLAGS="-L$(brew --prefix icu4c)/lib -L$(brew --prefix readline)/lib" export PKG_CONFIG_PATH="$(brew --prefix icu4c)/lib/pkgconfig" -- 2.39.1