Merge lp:~hjd/widelands/macos-brew-update-workaround into lp:widelands

[Hans Joachim Desserud]

Let's see if the workaround works.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2714. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/292269289.
Appveyor build 2527. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_macos_brew_update_workaround-2527.

[SirVer (sirver)]

Awesome! Thanks for the quick turnaround on the fix.

@bunnybot merge

> Am 25.10.2017 um 02:01 schrieb bunnybot <email address hidden>:
>
> Continuous integration builds have changed state:
>
> Travis build 2714. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/292269289.
> Appveyor build 2527. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_macos_brew_update_workaround-2527.
> --
> https://code.launchpad.net/~hjd/widelands/macos-brew-update-workaround/+merge/332739
> You are subscribed to branch lp:widelands.

=== modified file '.travis.yml'
--- .travis.yml	2017-08-09 16:41:05 +0000
+++ .travis.yml	2017-10-24 19:23:20 +0000
@@ -7,6 +7,7 @@
   - export DISPLAY=:99.0
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ( sudo Xvfb :99 -ac -screen 0 1024x768x8; echo ok )& fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
   - sleep 3 # give xvfb some time to start
 
 # ignore this branch because it is only a mirror of master