Skip to content

Commit 69ed188

Browse files
committed
Simplify Mac builds on Travis
- don't specify a fixed build environment version, use the default instead (https://docs.travis-ci.com/user/reference/osx#OS-X-Version) - hide the `brew update` output unless there is an error (this is 1500+ lines in recent builds) - remove an error message related to installing libpng, which is already a dependency of python3
1 parent 4dadbd2 commit 69ed188

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

.travis.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ matrix:
8585
- python: "nightly"
8686
env: PRE=--pre
8787
- os: osx
88-
osx_image: xcode7.3
8988
language: generic # https://github.com/travis-ci/travis-ci/issues/2312
9089
env: MOCK=mock
9190
only: master
@@ -109,8 +108,8 @@ before_install:
109108
export PATH=$PATH:/tmp/λ
110109
export PATH=/usr/lib/ccache:$PATH
111110
else
112-
brew update
113-
brew install python3 libpng ffmpeg imagemagick mplayer ccache
111+
ci/travis/silence brew update
112+
brew install python3 ffmpeg imagemagick mplayer ccache
114113
# make 'python' mean 'python3'
115114
ln -sf /usr/local/bin/python3 /usr/local/bin/python
116115
hash -r

ci/travis/silence

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
3+
# Run a command, hiding its standard output and error if its exit
4+
# status is zero.
5+
6+
stdout=$(mktemp -t stdout) || exit 1
7+
stderr=$(mktemp -t stderr) || exit 1
8+
"$@" >$stdout 2>$stderr
9+
code=$?
10+
if [[ $code != 0 ]]; then
11+
cat $stdout
12+
cat $stderr >&2
13+
exit $code
14+
fi

0 commit comments

Comments
 (0)