widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/travis-osx into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1704640 in widelands: "Add osx build for Travis"
  https://bugs.launchpad.net/widelands/+bug/1704640

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/travis-osx/+merge/327490

Strictly WIP at the moment, but I believe I need a merge proposal for bunnybot to pick it up and run the builds? (Also is there a way to re-trigger builds manually? Might come in handy for this)

-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis-osx into lp:widelands.

=== modified file '.travis.sh'
--- .travis.sh	2017-07-03 12:24:47 +0000
+++ .travis.sh	2017-07-16 11:47:25 +0000
@@ -1,5 +1,8 @@
 set -ex
 
+if [[ "$TRAVIS_OS_NAME" == "linux" ]];
+#Install linux dependencies
+
 # Some of these commands fail transiently. We keep retrying them until they
 # succeed.
 if [ "$CXX" = "g++" ]; then
@@ -38,6 +41,14 @@
    zlib1g-dev \
 ; do sleep 10; done
 
+fi
+
+if [[ "$TRAVIS_OS_NAME" == "osx" ]];
+# Install osx dependencies
+brew install boost glew sdl2 sdl2image sdl2mixer sdl2ttf
+fi
+
+
 # Configure the build
 mkdir build
 cd build
@@ -45,6 +56,8 @@
 
 if [ "$BUILD_TYPE" == "Debug" ]; then
 
+if [[ "$TRAVIS_OS_NAME" == "linux" ]];
+#FIXME(codereview) Start easy, add complicated things to osx later...
    # Build the documentation. Any warning is an error.
    sudo pip install sphinx
    pushd ../doc/sphinx
@@ -66,6 +79,7 @@
       exit 1 # CodeCheck warnings.
    fi
 fi
+fi
 
 # Do the actual build.
 make -k -j3

=== modified file '.travis.yml'
--- .travis.yml	2017-05-03 18:55:33 +0000
+++ .travis.yml	2017-07-16 11:47:25 +0000
@@ -3,6 +3,10 @@
 sudo: required
 dist: trusty
 
+os:
+  - linux
+  - osx
+
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"