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

Commit 73befdf

Browse files
committed
Fix travis build to actually use gcc5
1 parent 801df5f commit 73befdf

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

Diff for: .travis.yml

+14-10
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,19 @@ matrix:
2929
env:
3030
# NAME has no actual use, just to make the travis jobs overview more clear
3131
- NAME="gcc5 Debug/Tests/AddressSanitizer/Coveralls"
32-
- CXX=g++-5
33-
- CC=gcc-5
34-
- PELOTON_BUILD_TYPE=Debug
35-
- COVERALLS=On
32+
# set env variables manually
33+
before_install:
34+
- export CXX=g++-5
35+
- export CC=gcc-5
36+
- export PELOTON_BUILD_TYPE=Debug
37+
- export COVERALLS=On
3638
# override script value to run also tests and benchmarks
3739
script:
3840
# create build directory
3941
- mkdir build
4042
- cd build
4143
# run cmake. NOTE: the PATH is made explicit to avoid automatic selection of the preinstalled llvm version in the Travis trusty image
42-
- 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 ..
44+
- 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 ..
4345
# build
4446
- make -j4
4547
# run tests
@@ -72,17 +74,19 @@ matrix:
7274
env:
7375
# NAME has no actual use, just to make the travis jobs overview more clear
7476
- NAME="gcc5 Release/Tests/AddressSanitizer"
75-
- CXX=g++-5
76-
- CC=gcc-5
77-
- PELOTON_BUILD_TYPE=Release
78-
- COVERALLS=Off
77+
# set env variables manually
78+
before_install:
79+
- export CXX=g++-5
80+
- export CC=gcc-5
81+
- export PELOTON_BUILD_TYPE=Release
82+
- export COVERALLS=Off
7983
# override script value to run also tests and benchmarks
8084
script:
8185
# create build directory
8286
- mkdir build
8387
- cd build
8488
# run cmake. NOTE: the PATH is made explicit to avoid automatic selection of the preinstalled llvm version in the Travis trusty image
85-
- 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 ..
89+
- 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 ..
8690
# build
8791
- make -j4
8892
# run tests

0 commit comments

Comments
 (0)