From 6caacb7120bb69fcd88252102916743bda09270d Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 12 May 2023 17:31:14 +0300 Subject: [PATCH] CI: Install mysql-client version 5.7 for os_x job Current version has issues ( https://github.com/Homebrew/homebrew-core/issues/130258 ) Also adjust openssl paths as older version (1.1) of that is the dependency for the 5.7 mysql-client See osdn #48016 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 2 +- scripts/ci-build.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d4a5e4aa2..d552c163dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,7 +78,7 @@ jobs: sdl2_mixer \ sdl2_ttf \ qt@6 \ - mysql-client \ + mysql-client@5.7 \ postgresql \ unixodbc - name: build diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh index 55960daafb..d14268b1c4 100755 --- a/scripts/ci-build.sh +++ b/scripts/ci-build.sh @@ -57,9 +57,9 @@ 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)/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" +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" export PKG_CONFIG_PATH="$(brew --prefix icu4c)/lib/pkgconfig" export MOCCMD=$(find /usr/local/Cellar/qt -name "moc" | head -n 1) -- 2.39.2