widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/osx-update 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/osx-update/+merge/334281

(WIP, created merge proposal to build with travis)

As mentioned more on the bug report, this is currently to test with the upcoming default osx image on travis. Once that has become the default, we can drop the osx_image line from the yml config, and no further changes should be needed for a while.

The new image is supposed to become default on November 28th (https://blog.travis-ci.com/2017-10-16-a-new-default-os-x-image-is-coming), and I'll add a comment here once this is ready for proper review :)
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/osx-update into lp:widelands.

=== modified file '.travis.yml'
--- .travis.yml	2017-10-24 19:18:57 +0000
+++ .travis.yml	2017-11-26 09:23:57 +0000
@@ -2,12 +2,12 @@
 script: bash -e .travis.sh
 sudo: required
 dist: trusty
+osx_image: xcode8.3
 
 before_script:
   - 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