From faa2e47877ca4f8aabda5df5ca3ab2c7703b3ed4 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 9 Jul 2023 07:32:59 +0300 Subject: [PATCH 24/24] CI: Use new mysql-client on mac build again See osdn #48372 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 2 +- scripts/ci-build.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcb7ae87c8..c516ac052a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,7 +80,7 @@ jobs: sdl2_mixer \ sdl2_ttf \ qt@6 \ - mysql-client@5.7 \ + mysql-client \ postgresql \ unixodbc - name: build diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index d14268b1c4..146a5fa9a6 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -57,9 +57,12 @@ ninja install "os_x") # gcc is an alias for clang on OS X -export PATH="$(brew --prefix llvm)/bin:$(brew --prefix gettext)/bin:$(brew --prefix icu4c)/bin:$(brew --prefix qt@6)/bin:$(brew --prefix mysql-client@5.7)/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 -I$(brew --prefix mysql-client@5.7)/include -I$(brew --prefix openssl@1.1)/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 -L$(brew --prefix mysql-client@5.7)/lib -L$(brew --prefix openssl@1.1)/lib" +MSQLPFX="$(brew --prefix mysql-client)" +OSSL_PFX="$(brew --prefix openssl)" + +export PATH="$(brew --prefix llvm)/bin:$(brew --prefix gettext)/bin:$(brew --prefix icu4c)/bin:$(brew --prefix qt@6)/bin:${MSQLPFX}/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 -I${MSQLPFX}/include -I${OSSL_PFX}/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 -L${MSQLPFX}/lib -L${OSSL_PFX}/lib" export PKG_CONFIG_PATH="$(brew --prefix icu4c)/lib/pkgconfig" export MOCCMD=$(find /usr/local/Cellar/qt -name "moc" | head -n 1) -- 2.40.1