From 5a1abd4964957ee2c0ed944fb194b109eda4c387 Mon Sep 17 00:00:00 2001 From: Anton Popovichenko Date: Fri, 16 Aug 2024 10:07:41 +0200 Subject: [PATCH] fix(CI/MacOS): Fix macOS mysql setup. (#19634) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(CI/MacOS): Try to fix macOS mysql setup. * Update ci-compile.sh * More debug code * Mooooore debug * Moooooorreee * Moooooooooooorereerererer * m o r e debug * more debug * more * More debug * 9.0.1.reinstall??? we already had mysql? * debug * Debug * Are we happy now? * No? And what about now?! * Adn now? * Yes, we are happy 😎 --- apps/ci/mac/ci-compile.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/apps/ci/mac/ci-compile.sh b/apps/ci/mac/ci-compile.sh index 6866acf8b2910a..aebca818f026b2 100755 --- a/apps/ci/mac/ci-compile.sh +++ b/apps/ci/mac/ci-compile.sh @@ -10,13 +10,24 @@ ccache -s cd var/build/obj +mysql_include_path=$(brew --prefix mysql)/include/mysql +mysql_lib_path=$(brew --prefix mysql)/lib/libmysqlclient.dylib + +if [ ! -d "$mysql_include_path" ]; then + echo "Original mysql include directory doesn't exist. Lets try to use the first available folder in mysql dir." + base_dir=$(brew --cellar mysql)/$(basename $(ls -d $(brew --cellar mysql)/*/ | head -n 1)) + echo "Trying the next mysql base dir: $base_dir" + mysql_include_path=$base_dir/include/mysql + mysql_lib_path=$base_dir/lib/libmysqlclient.dylib +fi + time cmake ../../../ \ -DTOOLS=1 \ -DBUILD_TESTING=1 \ -DSCRIPTS=static \ -DCMAKE_BUILD_TYPE=Release \ --DMYSQL_ADD_INCLUDE_PATH=/usr/local/include \ --DMYSQL_LIBRARY=/usr/local/lib/libmysqlclient.dylib \ +-DMYSQL_ADD_INCLUDE_PATH=$mysql_include_path \ +-DMYSQL_LIBRARY=$mysql_lib_path \ -DREADLINE_INCLUDE_DIR=/usr/local/opt/readline/include \ -DREADLINE_LIBRARY=/usr/local/opt/readline/lib/libreadline.dylib \ -DOPENSSL_INCLUDE_DIR="$OPENSSL_ROOT_DIR/include" \