widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/macos-brew-update-workaround into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1727021 in widelands: "Mac OS Travis fails on master"
  https://bugs.launchpad.net/widelands/+bug/1727021

For more details, see:
https://code.launchpad.net/~hjd/widelands/macos-brew-update-workaround/+merge/332739

Let's see if the workaround works.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/macos-brew-update-workaround into 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