Skip to content

Commit d716df0

Browse files
committed
Clear default inherited YAML values, when appropriate
2x osx jobs/stages do not need ANY Ubuntu-specific addons: apt: 2x style checking stages (which run on Ubuntu images) may need Python 3, but do not need newer Clang version, env:, compiler: blocks Eventually, Homebrew dependencies on macOS builds will be formulated in an addon: block (functionality extended to Homebrew on 2018-09-18)
1 parent 66dd741 commit d716df0

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

.travis.yml

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# .travis.yml
2-
# Defines build matrix and regression tests for Travis CI.com
2+
# Defines build matrix and regression tests for Travis CI
33
language: cpp
44
branches:
55
only:
66
- master
77
- dust
88
- mhd4_3D
9-
# Default build matrix is 4x Ubuntu builds:
9+
# Default build matrix is 4x Ubuntu builds (inherit the default stage name "test"):
1010
os:
1111
- linux
1212
dist: trusty
@@ -42,7 +42,7 @@ cache:
4242
- hdf5
4343
- hdf5-1.10.4
4444

45-
# Explicitly includilng the 2x macOS jobs in build matrix
45+
# Explicitly includilng the 2x macOS jobs in build matrix (inherit the default stage name "test")
4646
# Must specify complete build details, or the jobs will inherit
4747
# the first value in the above arrays. Could encapsulate in script
4848
# --------------
@@ -56,6 +56,7 @@ matrix:
5656
- os: osx
5757
osx_image: xcode9.4
5858
compiler: clang++
59+
addons:
5960
env:
6061
- MPI_CHOICE=mpich
6162
# Override Linux cache mapping
@@ -78,6 +79,7 @@ matrix:
7879
- os: osx
7980
osx_image: xcode9.4
8081
compiler: clang++
82+
addons:
8183
env:
8284
- MPI_CHOICE=openmpi
8385
- TMPDIR=/tmp
@@ -102,12 +104,23 @@ matrix:
102104
- stage: python linter
103105
before_install: skip
104106
install: skip
107+
addons:
108+
apt:
109+
packages:
110+
- "python3"
111+
- "python3-pip"
112+
env:
113+
compiler:
105114
script: python3 -m flake8 --exclude=cpplint.py,openmpi-*; echo "Finished linting Python files with flake8"
106115
# Test Google C++ Style Guide adherence for .cpp, .hpp files:
107116
- stage: c++ linter
108117
before_install: skip
109118
install: skip
110119
before_script: skip
120+
addons:
121+
env:
122+
compiler:
123+
# "python" must point to Py2 distro, otherwise cpplint.py will silently quit while checking 1st file
111124
script: cd tst/style/; ./cpplint_athena.sh
112125

113126
# Recommended by Travis CI documentation to unset these for MPI builds to prevent conflicts

0 commit comments

Comments
 (0)