From eb8a59a14ccf10dffc73c3ac061e0cde0371738e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 23 Mar 2023 00:29:35 +0200 Subject: [PATCH 44/44] Revert "CI: Reinstall qt6 for mac builds before the builds" It was ever only meant as temporary workaround. See osdn #47646 Signed-off-by: Marko Lindqvist --- scripts/ci-build.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 146d5dd935..0be51f2a69 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -57,11 +57,6 @@ 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" @@ -97,11 +92,6 @@ 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.2