Skip to content

Commit 09141a5

Browse files
robertodrarnfinn
authored andcommitted
Switch to Ubuntu Trusty Linux image on Travis CI (#85)
The builds on Travis do not rely on PPAs anymore for Boost, an updated version of CMake and compilers. The Clang build on Linux now uses version 3.5 for the C/C++ compilers and version 4.6 for GFortran. The coverage analysis build is a debug mode build.
1 parent 12d07df commit 09141a5

File tree

2 files changed

+18
-32
lines changed

2 files changed

+18
-32
lines changed

.travis.yml

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: cpp
22
sudo: false
3+
dist: trusty
34
notifications:
45
slack:
56
secure: F2nQIW6SiaGdw1LjuZOlgBu8rUVMllrDG/5bhmTQP7gyETfViFBjTsHQdTle6jtdb+LudleZaG7WhdEiVcKUa834rKqDk1UOt9p6bsmgbsBZBAaxmPh01iVFhKn3ML7JLjfr1YtH7MWJcsS60cNBrohXfVKfFzNgDqZEu/llr90=
@@ -20,52 +21,40 @@ branches:
2021
matrix:
2122
include:
2223
- os: linux
23-
compiler: gcc
2424
addons: &1
2525
apt:
26-
sources:
27-
- ubuntu-toolchain-r-test
28-
- boost-latest
29-
- george-edison55-precise-backports
3026
packages:
31-
- cmake
32-
- cmake-data
27+
- cmake3
28+
- cmake3-data
3329
- g++-4.6
3430
- gcc-4.6
35-
- libboost1.55-all-dev
3631
- gfortran-4.6
32+
- libboost-math-dev
3733
env:
3834
- CXX_COMPILER='g++-4.6'
3935
- C_COMPILER='gcc-4.6'
4036
- Fortran_COMPILER='gfortran-4.6'
4137
- BUILD_TYPE='release'
4238
- PYTHON_VER='2.7'
4339
- os: linux
44-
compiler: clang
4540
addons:
4641
apt:
47-
sources:
48-
- llvm-toolchain-precise-3.5
49-
- ubuntu-toolchain-r-test
50-
- boost-latest
51-
- george-edison55-precise-backports
5242
packages:
53-
- cmake
54-
- cmake-data
55-
- clang-3.5
56-
- libboost1.55-all-dev
57-
- gfortran
43+
- cmake3
44+
- cmake3-data
45+
- clang
46+
- gfortran-4.6
47+
- libboost-math-dev
5848
env:
59-
- CXX_COMPILER='clang++-3.5'
60-
- C_COMPILER='clang-3.5'
61-
- Fortran_COMPILER='gfortran'
49+
- CXX_COMPILER='clang++'
50+
- C_COMPILER='clang'
51+
- Fortran_COMPILER='gfortran-4.6'
6252
- BUILD_TYPE='release'
6353
- PYTHON_VER='3.5'
6454
- STATIC='--static'
6555

6656
- os: osx
6757
osx_image: xcode7.3
68-
compiler: clang
6958
env:
7059
- CXX_COMPILER='clang++'
7160
- C_COMPILER='clang'
@@ -76,7 +65,6 @@ matrix:
7665
- STATIC='--static'
7766
- os: osx
7867
osx_image: xcode7.3
79-
compiler: gcc
8068
env:
8169
- CXX_COMPILER='g++-6'
8270
- C_COMPILER='gcc-6'
@@ -86,24 +74,22 @@ matrix:
8674
- HOMEBREW_GCC='homebrew/versions/gcc6'
8775

8876
- os: linux
89-
compiler: gcc
9077
addons: *1
9178
env:
9279
- CXX_COMPILER='g++-4.6'
9380
- C_COMPILER='gcc-4.6'
9481
- Fortran_COMPILER='gfortran-4.6'
95-
- BUILD_TYPE='release'
82+
- BUILD_TYPE='debug'
9683
- PYTHON_VER='2.7'
9784
- COVERAGE='--coverage'
9885
allow_failures:
9986
- os: linux
100-
compiler: gcc
10187
addons: *1
10288
env:
10389
- CXX_COMPILER='g++-4.6'
10490
- C_COMPILER='gcc-4.6'
10591
- Fortran_COMPILER='gfortran-4.6'
106-
- BUILD_TYPE='release'
92+
- BUILD_TYPE='debug'
10793
- PYTHON_VER='2.7'
10894
- COVERAGE='--coverage'
10995
install:

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ Continuous integration builds
3030
All CI builds are triggered by push events to any branch.
3131
Travis CI runs release builds using [ccache](https://ccache.samba.org/) to speed up compilation.
3232

33-
- Ubuntu 12.04 LTS 64-bit with CMake 3.3.2 and Boost 1.55.0 this is the
34-
environment offered by [Travis CI](https://travis-ci.org) pulling in various
35-
PPA. Python and Python packages are installed and managed _via_ Conda within
33+
- Ubuntu 14.04 LTS 64-bit with CMake 3.5.1 and Boost 1.54.0 this is the
34+
environment offered by [Travis CI](https://travis-ci.org).
35+
Python and Python packages are installed and managed _via_ Conda within
3636
an environment defined in the `.pcmsolver-travis.yml` file. The following
3737
compilers are used:
3838

3939
1. GCC 4.6, Python 2.7 This build generates _both_ the shared and static
4040
libraries, linking executables to the former. The build is run with and
41-
without coverage analysis.
41+
without coverage analysis, the latter being a _debug_ build.
4242
2. Clang 3.5, GFortran 4.6, Python 3.5 This build generates _only_ the static
4343
library.
4444

0 commit comments

Comments
 (0)