diff --git a/.travis.yml b/.travis.yml index a8d16d63..7685c31c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -110,17 +110,25 @@ matrix: install: - | if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then - if [[ "${COMPILER}" = "g++-5" ]]; then - brew install gcc5 + if [[ "${COMPILER}" == "g++-5" ]]; then + brew install gcc@5 + brew link --overwrite gcc@5 fi - if [[ "${COMPILER}" = "g++-6" ]]; then - brew install gcc6 + if [[ "${COMPILER}" == "g++-6" ]]; then + brew install gcc@6 + brew link --overwrite gcc@6 fi - if [[ "${COMPILER}" = "g++-7" ]]; then - brew install gcc7 + if [[ "${COMPILER}" == "g++-7" ]]; then + brew install gcc@7 + brew link --overwrite gcc@7 fi fi + - | + if [[ "${COMPILER}" == g++* ]]; then + export J="-j1" + fi + - export CXX="${COMPILER}" before_script: @@ -128,7 +136,7 @@ before_script: script: - travis_retry ./waf configure - - ./waf build + - ./waf build ${J} - ./build/release/bin/cquery --ci --log-all-to-stderr --test-unit - ./build/release/bin/cquery --ci --log-all-to-stderr --test-index