widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Cleaned up and ready to go (even re-fixed indentation which had been bothering me)

Diff comments:

> 
> === modified file '.travis.yml'
> --- .travis.yml	2017-07-16 21:14:17 +0000
> +++ .travis.yml	2017-08-01 15:26:34 +0000
> @@ -5,7 +5,8 @@
>  
>  before_script:
>    - export DISPLAY=:99.0
> -  - sh -e /etc/init.d/xvfb start
> +  - 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

I wasn't sure whether to keep this line since I didn't get the regression tests working. But then again I don't think it does any harm right now and in order to enable the regression tests this line or a very similar one will likely be needed.

>    - sleep 3 # give xvfb some time to start
>  
>  # ignore this branch because it is only a mirror of master


-- 
https://code.launchpad.net/~widelands-dev/widelands/travis-osx/+merge/327490
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis-osx into lp:widelands.