diff --git a/.travis.yml b/.travis.yml index 2bed5bf4..e8f3b7a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,11 @@ services: docker addons: hosts: - mariadb.example.com + homebrew: + packages: + - openssl + - libiodbc + - mariadb before_install: - chmod +x .travis/script.sh diff --git a/.travis/osx.sh b/.travis/osx.sh index 487c8919..fb0866eb 100644 --- a/.travis/osx.sh +++ b/.travis/osx.sh @@ -13,18 +13,20 @@ export TEST_UID=root export TEST_PASSWORD= # for some reason brew upgrades postgresql, so let's remove it -brew remove postgis -brew uninstall --ignore-dependencies postgresql +# brew remove postgis +# brew uninstall --ignore-dependencies postgresql # upgrade openssl -brew upgrade openssl +# brew upgrade openssl # install unixodbc -brew install libiodbc +# brew install libiodbc # install and start MariaDB Server -brew install mariadb +# brew install mariadb mysql.server start -cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_OPENSSL=ON -DWITH_IODBC=ON -DOPENSSL_ROOT_DIR=/usr/local/Cellar/openssl/1.0.2q -DOPENSSL_LIBRARIES=/usr/local/Cellar/openssl/1.0.2q/lib +# ls -la /usr/local/Cellar/openssl/ +cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_OPENSSL=ON -DWITH_IODBC=ON -DOPENSSL_ROOT_DIR=/usr/local/Cellar/openssl/1.0.2o_2 -DOPENSSL_LIBRARIES=/usr/local/Cellar/openssl/1.0.2o_2/lib cmake --build . --config RelWithDebInfo + ################################################################################################################### # run test suite ###################################################################################################################