Skip to content

Commit b541a91

Browse files
robertodrilfreddy
robertodr
authored and
ilfreddy
committed
Prune Travis CI build menu (#82)
1 parent 7b528c2 commit b541a91

File tree

3 files changed

+35
-253
lines changed

3 files changed

+35
-253
lines changed

‎.scripts/ci_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
# The return code will capture an error from ANY of the functions in the pipe
4-
set -o pipefail
4+
set -euo pipefail
55
cmake --build . -- --jobs=2 VERBOSE=1 | tee build.log | grep "Building"
66
RESULT=$?
77

‎.travis.yml‎

Lines changed: 25 additions & 234 deletions
Original file line numberDiff line numberDiff line change
@@ -20,152 +20,49 @@ branches:
2020
matrix:
2121
include:
2222
- os: linux
23-
compiler: clang
23+
compiler: gcc
2424
addons: &1
2525
apt:
2626
sources:
27-
- llvm-toolchain-precise-3.5
2827
- ubuntu-toolchain-r-test
2928
- boost-latest
3029
- george-edison55-precise-backports
3130
packages:
3231
- cmake
3332
- cmake-data
34-
- clang-3.5
35-
- libboost1.55-all-dev
36-
- gfortran
37-
env:
38-
- CXX_COMPILER='clang++-3.5'
39-
- C_COMPILER='clang-3.5'
40-
- Fortran_COMPILER='gfortran'
41-
- BUILD_TYPE='release'
42-
- PYTHON_VER='2.7'
43-
- os: osx
44-
osx_image: xcode7.3
45-
compiler: clang
46-
env:
47-
- CXX_COMPILER='clang++'
48-
- C_COMPILER='clang'
49-
- Fortran_COMPILER='gfortran-4.8'
50-
- BUILD_TYPE='release'
51-
- PYTHON_VER='2.7'
52-
- HOMEBREW_GCC='homebrew/versions/gcc48'
53-
- os: linux
54-
compiler: clang
55-
addons: &2
56-
apt:
57-
sources:
58-
- llvm-toolchain-precise-3.6
59-
- ubuntu-toolchain-r-test
60-
- boost-latest
61-
- george-edison55-precise-backports
62-
packages:
63-
- cmake
64-
- cmake-data
65-
- clang-3.6
33+
- g++-4.6
34+
- gcc-4.6
6635
- libboost1.55-all-dev
67-
- gfortran
68-
env:
69-
- CXX_COMPILER='clang++-3.6'
70-
- C_COMPILER='clang-3.6'
71-
- Fortran_COMPILER='gfortran'
72-
- BUILD_TYPE='release'
73-
- STATIC='--static'
74-
- PYTHON_VER='3.5'
75-
- os: osx
76-
osx_image: xcode7.3
77-
compiler: gcc
36+
- gfortran-4.6
7837
env:
79-
- CXX_COMPILER='g++-4.8'
80-
- C_COMPILER='gcc-4.8'
81-
- Fortran_COMPILER='gfortran-4.8'
38+
- CXX_COMPILER='g++-4.6'
39+
- C_COMPILER='gcc-4.6'
40+
- Fortran_COMPILER='gfortran-4.6'
8241
- BUILD_TYPE='release'
8342
- PYTHON_VER='2.7'
84-
- HOMEBREW_GCC='homebrew/versions/gcc48'
8543
- os: linux
8644
compiler: clang
87-
addons: &3
45+
addons:
8846
apt:
8947
sources:
90-
- llvm-toolchain-precise-3.7
48+
- llvm-toolchain-precise-3.5
9149
- ubuntu-toolchain-r-test
9250
- boost-latest
9351
- george-edison55-precise-backports
9452
packages:
9553
- cmake
9654
- cmake-data
97-
- clang-3.7
55+
- clang-3.5
9856
- libboost1.55-all-dev
9957
- gfortran
10058
env:
101-
- CXX_COMPILER='clang++-3.7'
102-
- C_COMPILER='clang-3.7'
59+
- CXX_COMPILER='clang++-3.5'
60+
- C_COMPILER='clang-3.5'
10361
- Fortran_COMPILER='gfortran'
104-
- PYTHON_VER='2.7'
105-
- BUILD_TYPE='release'
106-
- os: osx
107-
osx_image: xcode7.3
108-
compiler: clang
109-
env:
110-
- CXX_COMPILER='clang++'
111-
- C_COMPILER='clang'
112-
- Fortran_COMPILER='gfortran-4.9'
11362
- BUILD_TYPE='release'
11463
- PYTHON_VER='3.5'
115-
- HOMEBREW_GCC='homebrew/versions/gcc49'
11664
- STATIC='--static'
117-
- os: linux
118-
compiler: clang
119-
addons: &4
120-
apt:
121-
sources:
122-
- llvm-toolchain-precise-3.8
123-
- ubuntu-toolchain-r-test
124-
- boost-latest
125-
- george-edison55-precise-backports
126-
packages:
127-
- cmake
128-
- cmake-data
129-
- clang-3.8
130-
- libboost1.55-all-dev
131-
- gfortran
132-
env:
133-
- CXX_COMPILER='clang++-3.8'
134-
- C_COMPILER='clang-3.8'
135-
- Fortran_COMPILER='gfortran'
136-
- BUILD_TYPE='release'
137-
- PYTHON_VER='3.5'
138-
- os: osx
139-
osx_image: xcode7.3
140-
compiler: gcc
141-
env:
142-
- CXX_COMPILER='g++-4.9'
143-
- C_COMPILER='gcc-4.9'
144-
- Fortran_COMPILER='gfortran-4.9'
145-
- BUILD_TYPE='release'
146-
- PYTHON_VER='3.5'
147-
- HOMEBREW_GCC='homebrew/versions/gcc49'
148-
- os: linux
149-
compiler: gcc
150-
addons: &5
151-
apt:
152-
sources:
153-
- ubuntu-toolchain-r-test
154-
- boost-latest
155-
- george-edison55-precise-backports
156-
packages:
157-
- cmake
158-
- cmake-data
159-
- g++-4.6
160-
- gcc-4.6
161-
- libboost1.55-all-dev
162-
- gfortran-4.6
163-
env:
164-
- CXX_COMPILER='g++-4.6'
165-
- C_COMPILER='gcc-4.6'
166-
- Fortran_COMPILER='gfortran-4.6'
167-
- BUILD_TYPE='release'
168-
- PYTHON_VER='2.7'
65+
16966
- os: osx
17067
osx_image: xcode7.3
17168
compiler: clang
@@ -176,91 +73,7 @@ matrix:
17673
- BUILD_TYPE='release'
17774
- PYTHON_VER='2.7'
17875
- HOMEBREW_GCC='homebrew/versions/gcc5'
179-
- os: linux
180-
compiler: gcc
181-
addons: &6
182-
apt:
183-
sources:
184-
- ubuntu-toolchain-r-test
185-
- boost-latest
186-
- george-edison55-precise-backports
187-
packages:
188-
- cmake
189-
- cmake-data
190-
- g++-4.7
191-
- gcc-4.7
192-
- libboost1.55-all-dev
193-
- gfortran-4.7
194-
env:
195-
- CXX_COMPILER='g++-4.7'
196-
- C_COMPILER='gcc-4.7'
197-
- Fortran_COMPILER='gfortran-4.7'
198-
- BUILD_TYPE='release'
199-
- STATIC='--static'
200-
- PYTHON_VER='3.5'
201-
- os: osx
202-
osx_image: xcode7.3
203-
compiler: gcc
204-
env:
205-
- CXX_COMPILER='g++-5'
206-
- C_COMPILER='gcc-5'
207-
- Fortran_COMPILER='gfortran-5'
208-
- BUILD_TYPE='release'
209-
- PYTHON_VER='2.7'
210-
- HOMEBREW_GCC='homebrew/versions/gcc5'
21176
- STATIC='--static'
212-
- os: linux
213-
compiler: gcc
214-
addons: &7
215-
apt:
216-
sources:
217-
- ubuntu-toolchain-r-test
218-
- boost-latest
219-
- george-edison55-precise-backports
220-
packages:
221-
- cmake
222-
- cmake-data
223-
- g++-4.8
224-
- gcc-4.8
225-
- libboost1.55-all-dev
226-
- gfortran-4.8
227-
env:
228-
- CXX_COMPILER='g++-4.8'
229-
- C_COMPILER='gcc-4.8'
230-
- Fortran_COMPILER='gfortran-4.8'
231-
- BUILD_TYPE='release'
232-
- PYTHON_VER='2.7'
233-
- os: osx
234-
osx_image: xcode7.3
235-
compiler: clang
236-
env:
237-
- CXX_COMPILER='clang++'
238-
- C_COMPILER='clang'
239-
- Fortran_COMPILER='gfortran-6'
240-
- BUILD_TYPE='release'
241-
- PYTHON_VER='3.5'
242-
- HOMEBREW_GCC='homebrew/versions/gcc6'
243-
- os: linux
244-
compiler: gcc
245-
addons: &8
246-
apt:
247-
sources:
248-
- ubuntu-toolchain-r-test
249-
- boost-latest
250-
- george-edison55-precise-backports
251-
packages:
252-
- cmake
253-
- cmake-data
254-
- g++-4.9
255-
- gcc-4.9
256-
- libboost1.55-all-dev
257-
- gfortran-4.9
258-
env:
259-
- CXX_COMPILER='g++-4.9'
260-
- C_COMPILER='gcc-4.9'
261-
- Fortran_COMPILER='gfortran-4.9'
262-
- BUILD_TYPE='release'
263-
- PYTHON_VER='3.5'
26477
- os: osx
26578
osx_image: xcode7.3
26679
compiler: gcc
@@ -271,48 +84,28 @@ matrix:
27184
- BUILD_TYPE='release'
27285
- PYTHON_VER='3.5'
27386
- HOMEBREW_GCC='homebrew/versions/gcc6'
87+
27488
- os: linux
27589
compiler: gcc
276-
addons: &9
277-
apt:
278-
sources:
279-
- ubuntu-toolchain-r-test
280-
- boost-latest
281-
- george-edison55-precise-backports
282-
packages:
283-
- cmake
284-
- cmake-data
285-
- g++-5
286-
- gcc-5
287-
- libboost1.55-all-dev
288-
- gfortran-5
90+
addons: *1
28991
env:
290-
- CXX_COMPILER='g++-5'
291-
- C_COMPILER='gcc-5'
292-
- Fortran_COMPILER='gfortran-5'
92+
- CXX_COMPILER='g++-4.6'
93+
- C_COMPILER='gcc-4.6'
94+
- Fortran_COMPILER='gfortran-4.6'
29395
- BUILD_TYPE='release'
29496
- PYTHON_VER='2.7'
295-
- os: linux
296-
compiler: gcc
297-
addons: *9
298-
env:
299-
- CXX_COMPILER='g++-5'
300-
- C_COMPILER='gcc-5'
301-
- Fortran_COMPILER='gfortran-5'
302-
- BUILD_TYPE='release'
30397
- COVERAGE='--coverage'
304-
- PYTHON_VER='2.7'
30598
allow_failures:
30699
- os: linux
307100
compiler: gcc
308-
addons: *9
101+
addons: *1
309102
env:
310-
- CXX_COMPILER='g++-5'
311-
- C_COMPILER='gcc-5'
312-
- Fortran_COMPILER='gfortran-5'
103+
- CXX_COMPILER='g++-4.6'
104+
- C_COMPILER='gcc-4.6'
105+
- Fortran_COMPILER='gfortran-4.6'
313106
- BUILD_TYPE='release'
314-
- COVERAGE='--coverage'
315107
- PYTHON_VER='2.7'
108+
- COVERAGE='--coverage'
316109
install:
317110
- |
318111
if [[ "${PYTHON_VER}" == "2.7" ]]; then
@@ -342,17 +135,15 @@ before_script:
342135
- python -V
343136
- cmake --version
344137
- cd ${TRAVIS_BUILD_DIR}
345-
- export CXX=${CXX_COMPILER}
138+
- echo 'Build set up summary'
346139
- ${CXX_COMPILER} --version
347-
- export CC=${C_COMPILER}
348140
- ${C_COMPILER} --version
349-
- export FC=${Fortran_COMPILER}
350141
- ${Fortran_COMPILER} --version
351142
- python setup.py --cxx=${CXX_COMPILER} --cc=${C_COMPILER} --fc=${Fortran_COMPILER} --type=${BUILD_TYPE} --cmake-options='-Hprojects/CMake' ${STATIC} ${COVERAGE}
352143
- cd build
353144
- ../.scripts/ci_build.sh
354145
script:
355-
- python ../.scripts/ci_test.py ctest --parallel 2 --output-on-failure --verbose --dashboard Experimental --track TravisCI
146+
- python ../.scripts/ci_test.py ctest --output-on-failure --verbose
356147
- python ../.scripts/ci_print_failing.py
357148
after_success:
358149
- |

‎README.md‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,37 +29,28 @@ Continuous integration builds
2929

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.
32-
The outcome of the CI builds is deployed to the [build dashboard](https://testboard.org/cdash/index.php?project=PCMSolver)
3332

3433
- Ubuntu 12.04 LTS 64-bit with CMake 3.3.2 and Boost 1.55.0 this is the
3534
environment offered by [Travis CI](https://travis-ci.org) pulling in various
3635
PPA. Python and Python packages are installed and managed _via_ Conda within
3736
an environment defined in the `.pcmsolver-travis.yml` file. The following
3837
compilers are used:
3938

40-
1. GCC 4.6, Python 2.7
41-
2. GCC 4.7, Python 3.5
42-
3. GCC 4.8, Python 2.7
43-
4. GCC 4.9, Python 3.5
44-
5. GCC 5.1, Python 2.7, with and without coverage analysis
45-
6. Clang 3.5, GFortran 4.6, Python 2.7
46-
7. Clang 3.6, GFortran 4.6, Python 3.5
47-
8. Clang 3.7, GFortran 4.6, Python 2.7
48-
9. Clang 3.8, GFortran 4.6, Python 3.5
39+
1. GCC 4.6, Python 2.7 This build generates _both_ the shared and static
40+
libraries, linking executables to the former. The build is run with and
41+
without coverage analysis.
42+
2. Clang 3.5, GFortran 4.6, Python 3.5 This build generates _only_ the static
43+
library.
4944

5045
- Mac OS X 10.11 with CMake 3.6.2 and Boost 1.61.0
5146
this is the environment offered by [Travis CI](https://travis-ci.org)
5247
with their Xcode 7.3.1 image.
5348
The following compilers are used:
5449

55-
1. Apple LLVM 7.3.0, GFortran 4.8.5, Python 2.7
56-
2. GCC 4.8.5, Python 2.7
57-
3. Apple LLVM 7.3.0, GFortran 4.9.3, Python 3.5
58-
4. GCC 4.9.3, Python 3.5
59-
5. Apple LLVM 7.3.0, GFortran 5.4.0, Python 2.7
60-
6. GCC 5.4.0, Python 2.7
61-
7. Apple LLVM 7.3.0, GFortran 6.2.0, Python 3.5
62-
8. GCC 6.2.0, Python 3.5
50+
1. Apple LLVM 7.3.0, GFortran 5.4.0, Python 2.7 This build generates _only_
51+
the static library.
52+
2. GCC 6.2.0, Python 3.5 This build generates _both_ the shared and static
53+
libraries, linking executables to the former.
6354

6455
The build needed for submission to [Coverity scan](https://scan.coverity.com/)
6556
is triggered by pushes to the `coverity_scan` branch. It is run on

0 commit comments

Comments
 (0)