Skip to content

Commit

Permalink
Merge pull request #310 from cdunn2001/0.y.z
Browse files Browse the repository at this point in the history
gcc-4.6, clang-3.3
  • Loading branch information
cdunn2001 committed Jul 12, 2015
2 parents fb13012 + 138c48b commit 02839ef
Showing 1 changed file with 24 additions and 6 deletions.
30 changes: 24 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,30 @@
# http://about.travis-ci.org/docs/user/build-configuration/
# This file can be validated on:
# http://lint.travis-ci.org/
# See also
# http://stackoverflow.com/questions/22111549/travis-ci-with-clang-3-4-and-c11/30925448#30925448
# to allow C++11, though we are not yet building with -std=c++11

#before_install: sudo apt-get install -y cmake
# cmake is pre-installed in Travis for both linux and osx

before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq valgrind
install:
# /usr/bin/gcc is 4.6 always, but gcc-X.Y is available.
#- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.6" CC="gcc-4.6"; fi
# /usr/bin/clang is our version already, and clang-X.Y does not exist.
#- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.3" CC="clang-3.3"; fi
- echo ${PATH}
- ls /usr/local
- export PATH=/usr/bin:${PATH}
- echo ${CXX}
- ${CXX} --version
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-4.6
- g++-4.6
- clang-3.3
- valgrind
os:
- linux
language: cpp
Expand All @@ -23,3 +40,4 @@ env:
notifications:
email:
- aaronjjacobs@gmail.com
sudo: false

0 comments on commit 02839ef

Please sign in to comment.