Skip to content
This repository has been archived by the owner on Sep 27, 2019. It is now read-only.

Commit

Permalink
Fix travis build to actually use gcc5
Browse files Browse the repository at this point in the history
  • Loading branch information
tcm-marcel committed Apr 25, 2018
1 parent 801df5f commit 73befdf
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,19 @@ matrix:
env:
# NAME has no actual use, just to make the travis jobs overview more clear
- NAME="gcc5 Debug/Tests/AddressSanitizer/Coveralls"
- CXX=g++-5
- CC=gcc-5
- PELOTON_BUILD_TYPE=Debug
- COVERALLS=On
# set env variables manually
before_install:
- export CXX=g++-5
- export CC=gcc-5
- export PELOTON_BUILD_TYPE=Debug
- export COVERALLS=On
# override script value to run also tests and benchmarks
script:
# create build directory
- mkdir build
- cd build
# run cmake. NOTE: the PATH is made explicit to avoid automatic selection of the preinstalled llvm version in the Travis trusty image
- PATH=/usr/lib/llvm-3.7/bin:/usr/bin:$PATH cmake -DCOVERALLS=$COVERALLS -DCMAKE_PREFIX_PATH=`llvm-config-3.7 --prefix` -DCMAKE_BUILD_TYPE=$PELOTON_BUILD_TYPE -DUSE_SANITIZER=Address ..
- PATH=/usr/lib/llvm-3.7/bin:/usr/bin:$PATH CXX=g++-5 cmake -DCOVERALLS=$COVERALLS -DCMAKE_PREFIX_PATH=`llvm-config-3.7 --prefix` -DCMAKE_BUILD_TYPE=$PELOTON_BUILD_TYPE -DUSE_SANITIZER=Address ..
# build
- make -j4
# run tests
Expand Down Expand Up @@ -72,17 +74,19 @@ matrix:
env:
# NAME has no actual use, just to make the travis jobs overview more clear
- NAME="gcc5 Release/Tests/AddressSanitizer"
- CXX=g++-5
- CC=gcc-5
- PELOTON_BUILD_TYPE=Release
- COVERALLS=Off
# set env variables manually
before_install:
- export CXX=g++-5
- export CC=gcc-5
- export PELOTON_BUILD_TYPE=Release
- export COVERALLS=Off
# override script value to run also tests and benchmarks
script:
# create build directory
- mkdir build
- cd build
# run cmake. NOTE: the PATH is made explicit to avoid automatic selection of the preinstalled llvm version in the Travis trusty image
- PATH=/usr/lib/llvm-3.7/bin:/usr/bin:$PATH cmake -DCOVERALLS=$COVERALLS -DCMAKE_PREFIX_PATH=`llvm-config-3.7 --prefix` -DCMAKE_BUILD_TYPE=$PELOTON_BUILD_TYPE -DUSE_SANITIZER=Address ..
- PATH=/usr/lib/llvm-3.7/bin:/usr/bin:$PATH CXX=g++-5 cmake -DCOVERALLS=$COVERALLS -DCMAKE_PREFIX_PATH=`llvm-config-3.7 --prefix` -DCMAKE_BUILD_TYPE=$PELOTON_BUILD_TYPE -DUSE_SANITIZER=Address ..
# build
- make -j4
# run tests
Expand Down

0 comments on commit 73befdf

Please sign in to comment.