From 887f6fd48f57343dee5c37ba2bd56e1709956efb Mon Sep 17 00:00:00 2001 From: Eugene Kliuchnikov Date: Tue, 20 Sep 2016 10:10:21 +0200 Subject: [PATCH 1/2] Fix integration build Homebrew started getting stuck with gcc-6 Temporarily switch to gcc-5 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bccc6d..005a1f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -138,10 +138,10 @@ matrix: ## all since we already test all these versions of GCC on Linux. ## We'll just test 4.4 and the most recent version. ### - - os: osx - env: BUILD_SYSTEM=cmake C_COMPILER=gcc-6 CXX_COMPILER=g++-6 - # - os: osx - # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-5 CXX_COMPILER=g++-5 + #- os: osx + # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-6 CXX_COMPILER=g++-6 + - os: osx + env: BUILD_SYSTEM=cmake C_COMPILER=gcc-5 CXX_COMPILER=g++-5 # - os: osx # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.9 CXX_COMPILER=g++-4.9 # - os: osx From ea9c51e4ca4628fd2022b622caf90ff7df233cbd Mon Sep 17 00:00:00 2001 From: Eugene Kliuchnikov Date: Tue, 20 Sep 2016 10:11:46 +0200 Subject: [PATCH 2/2] Update .travis.yml --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 005a1f1..f429ab6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -138,10 +138,10 @@ matrix: ## all since we already test all these versions of GCC on Linux. ## We'll just test 4.4 and the most recent version. ### - #- os: osx - # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-6 CXX_COMPILER=g++-6 - - os: osx - env: BUILD_SYSTEM=cmake C_COMPILER=gcc-5 CXX_COMPILER=g++-5 + # - os: osx + # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-6 CXX_COMPILER=g++-6 + - os: osx + env: BUILD_SYSTEM=cmake C_COMPILER=gcc-5 CXX_COMPILER=g++-5 # - os: osx # env: BUILD_SYSTEM=cmake C_COMPILER=gcc-4.9 CXX_COMPILER=g++-4.9 # - os: osx