Attempt to fix travis build
This commit is contained in:
parent
09d99c8a1f
commit
e9d1d60af2
15
.travis.yml
15
.travis.yml
@ -1,19 +1,19 @@
|
||||
sudo: required
|
||||
sudo: false #required
|
||||
language: cpp
|
||||
|
||||
before_install:
|
||||
before_install:
|
||||
# Define TRAVIS variable for workarounds
|
||||
- export CXXFLAGS="$CXXFLAGS -DTRAVIS"
|
||||
|
||||
install:
|
||||
- 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
|
||||
#install:
|
||||
# - 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
|
||||
compiler:
|
||||
- gcc
|
||||
- clang
|
||||
|
||||
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
@ -22,5 +22,8 @@ addons:
|
||||
- gcc-4.8
|
||||
- g++-4.8
|
||||
- clang
|
||||
- libwxgtk3.0-dev
|
||||
- libwxgtk3.0-0
|
||||
- libssh2-1-dev
|
||||
|
||||
script: make clean run-tests
|
||||
|
Loading…
Reference in New Issue
Block a user