jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add gcc-6 Travis testing and use gcc-5.3 instead of gcc-5.2

Browse source 
Test Python, Java and C# with gcc-6
Test gcc-5 on Trusty instead of on Precise to pick up gcc-5.3 instead of gcc-5.2
This commit is contained in:
William S Fulton 2016-05-28 17:46:47 +01:00
commit 1f0acadcf0
2 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
.travis.yml
View file

@ -9,8 +9,12 @@ matrix:
env: SWIGLANG= env: SWIGLANG=
- os: linux - os: linux
env: SWIGLANG= SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1 env: SWIGLANG= SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
sudo: required
dist: trusty
- os: linux - os: linux
env: SWIGLANG= SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP14=1 env: SWIGLANG= SWIG_CC=gcc-6 SWIG_CXX=g++-6
sudo: required
dist: trusty
- compiler: gcc - compiler: gcc
os: linux os: linux
env: SWIGLANG=csharp env: SWIGLANG=csharp
@ -119,10 +123,28 @@ matrix:
env: SWIGLANG=tcl env: SWIGLANG=tcl
- os: linux - os: linux
env: SWIGLANG=csharp SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1 env: SWIGLANG=csharp SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
sudo: required
dist: trusty
- os: linux - os: linux
env: SWIGLANG=java SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1 env: SWIGLANG=java SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
sudo: required
dist: trusty
- os: linux - os: linux
env: SWIGLANG=python SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1 env: SWIGLANG=python SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
sudo: required
dist: trusty
- os: linux
env: SWIGLANG=csharp SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
sudo: required
dist: trusty
- os: linux
env: SWIGLANG=java SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
sudo: required
dist: trusty
- os: linux
env: SWIGLANG=python SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
sudo: required
dist: trusty
- os: osx - os: osx
env: SWIGLANG= SWIG_CC=gcc-4.2 SWIG_CXX=g++-4.2 env: SWIGLANG= SWIG_CC=gcc-4.2 SWIG_CXX=g++-4.2
- compiler: clang - compiler: clang

11
Tools/travis-linux-install.sh
View file

@ -7,13 +7,16 @@ sudo apt-get -qq update
if [[ "$CC" == gcc-5 ]]; then if [[ "$CC" == gcc-5 ]]; then
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo add-apt-repository -y ppa:boost-latest/ppa
sudo apt-get -qq update sudo apt-get -qq update
sudo apt-get install -qq g++-5 libboost1.55-dev sudo apt-get install -qq g++-5
else elif [[ "$CC" == gcc-6 ]]; then
sudo apt-get -qq install libboost-dev sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get -qq update
sudo apt-get install -qq g++-6
fi fi
sudo apt-get -qq install libboost-dev
WITHLANG=$SWIGLANG WITHLANG=$SWIGLANG
case "$SWIGLANG" in case "$SWIGLANG" in