Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Speed up Mac build on Travis by not updating brew
  • Loading branch information
rasmushoj committed Jan 14, 2019
1 parent ad991a2 commit 2b6ec8c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Expand Up @@ -4,6 +4,11 @@ services: docker
addons:
hosts:
- mariadb.example.com
homebrew:
packages:
- openssl
- libiodbc
- mariadb

before_install:
- chmod +x .travis/script.sh
Expand Down
14 changes: 8 additions & 6 deletions .travis/osx.sh
Expand Up @@ -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
###################################################################################################################
Expand Down

0 comments on commit 2b6ec8c

Please sign in to comment.