Merge pull request #10491 from jkseppan/macos-build

jkseppan · web-flow · commit 150ed2520980 · 2018-02-16T16:49:11.000+02:00
Simplify Mac builds on Travis
diff --git a/.travis.yml b/.travis.yml
@@ -85,7 +85,6 @@ matrix:
     - python: "nightly"
       env: PRE=--pre
     - os: osx
-      osx_image: xcode7.3
       language: generic  # https://github.com/travis-ci/travis-ci/issues/2312
       env: MOCK=mock
       only: master
@@ -109,8 +108,8 @@ before_install:
       export PATH=$PATH:/tmp/λ
       export PATH=/usr/lib/ccache:$PATH
     else
-      brew update
-      brew install python3 libpng ffmpeg imagemagick mplayer ccache
+      ci/travis/silence brew update
+      brew install python3 ffmpeg imagemagick mplayer ccache
       # make 'python' mean 'python3'
       ln -sf /usr/local/bin/python3 /usr/local/bin/python
       hash -r
diff --git a/ci/travis/silence b/ci/travis/silence
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Run a command, hiding its standard output and error if its exit
+# status is zero.
+
+stdout=$(mktemp -t stdout) || exit 1
+stderr=$(mktemp -t stderr) || exit 1
+"$@" >$stdout 2>$stderr
+code=$?
+if [[ $code != 0 ]]; then
+    cat $stdout
+    cat $stderr >&2
+    exit $code
+fi
