Revert "Try another kind of travis build"

This reverts commit 75d989f97a.
This commit is contained in:
Tim Warren 2015-07-10 15:20:14 -04:00
parent 75d989f97a
commit da14a761cd

View File

@ -1,3 +1,4 @@
sudo: required
language: cpp language: cpp
before_install: before_install:
@ -5,7 +6,8 @@ before_install:
- export CXXFLAGS="$CXXFLAGS -DTRAVIS" - export CXXFLAGS="$CXXFLAGS -DTRAVIS"
install: install:
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi - sudo apt-get install -qq libwxgtk3.0-dev libwxgtk3.0-0 libssh2-1-dev
- if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 98; fi
# Build with both gcc and clang # Build with both gcc and clang
compiler: compiler:
@ -17,9 +19,6 @@ addons:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- libwxgtk3.0-dev
- libwxgtk3.0-0
- libssh2-1-dev
- gcc-4.8 - gcc-4.8
- g++-4.8 - g++-4.8
- clang - clang