Ready for feedback (probably not merge yet) Diff comments:
> === modified file '.travis.sh' > --- .travis.sh 2017-07-03 12:24:47 +0000 > +++ .travis.sh 2017-07-17 10:56:58 +0000 > @@ -1,5 +1,10 @@ > set -ex > > +#TODO yes, i'll fix indentation at some point :) > +if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then > +#Install linux dependencies > +exit #FIXME try to short-circuit linux-builds to reduce long build times. I > don't really need to know the result of all these builds at this point Will naturally remove this part before the final merge. Though I believe I will need to keep the compiler-installations wrapped in a linux-if. It seems like CXX is set regardless, and I assume osx would be rather confused if someone tries to run `apt-get` It will probably also push me to fix the indentation. Sorry it looks like that, but I didn't know how many of them would be kept when they were added initially. > + > # Some of these commands fail transiently. We keep retrying them until they > # succeed. > if [ "$CXX" = "g++" ]; then > @@ -38,6 +43,18 @@ > zlib1g-dev \ > ; do sleep 10; done > > +fi > + > +if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then > + # Install osx dependencies > + # boost and cmake are preinstalled :) > + brew install gettext glew icu4c sdl2 sdl2_image sdl2_mixer sdl2_ttf zlib > + # brew doesn't add a link by default > + brew link --force gettext > + brew link --force icu4c > +fi The osx "standalone page" mentioned that additional environment variables needed to be created, similar to the script which does a mac build. However, from what I can see, everything built successfully. Unless this is related to the error messages I get when attempting to run the regression test suite. > + > + > # Configure the build > mkdir build > cd build > > === modified file '.travis.yml' > --- .travis.yml 2017-05-03 18:55:33 +0000 > +++ .travis.yml 2017-07-17 10:56:58 +0000 > @@ -15,35 +15,44 @@ > > matrix: > include: > - - compiler: clang > - env: CLANG_VERSION="3.4" BUILD_TYPE="Debug" > - - compiler: clang > - env: CLANG_VERSION="3.5" BUILD_TYPE="Debug" > - - compiler: clang > - env: CLANG_VERSION="3.9" BUILD_TYPE="Debug" > - - compiler: clang > + ### MAC OSX BUILDS > + - os: osx > + env: BUILD_TYPE="Debug" > + - os: osx > + env: BUILD_TYPE="Release" > + ### LINUX + CLANG BUILDS > +# TODO Temporarily reduce number of builds for faster feedback > +# - compiler: clang Will need to add `os:linux` for most of these when re-enabling. > +# env: CLANG_VERSION="3.4" BUILD_TYPE="Debug" > +# - compiler: clang > +# env: CLANG_VERSION="3.5" BUILD_TYPE="Debug" > +# - compiler: clang > +# env: CLANG_VERSION="3.9" BUILD_TYPE="Debug" > + - os: linux > + compiler: clang > env: CLANG_VERSION="4.0" BUILD_TYPE="Debug" > - - compiler: clang > - env: CLANG_VERSION="3.4" BUILD_TYPE="Release" > - - compiler: clang > - env: CLANG_VERSION="3.5" BUILD_TYPE="Release" > - - compiler: clang > - env: CLANG_VERSION="3.9" BUILD_TYPE="Release" > - - compiler: clang > - env: CLANG_VERSION="4.0" BUILD_TYPE="Release" > - - compiler: gcc > - env: GCC_VERSION="4.8" BUILD_TYPE="Debug" > - - compiler: gcc > - env: GCC_VERSION="4.9" BUILD_TYPE="Debug" > - - compiler: gcc > - env: GCC_VERSION="6" BUILD_TYPE="Debug" > +# - compiler: clang > +# env: CLANG_VERSION="3.4" BUILD_TYPE="Release" > +# - compiler: clang > +# env: CLANG_VERSION="3.5" BUILD_TYPE="Release" > +# - compiler: clang > +# env: CLANG_VERSION="3.9" BUILD_TYPE="Release" > +# - compiler: clang > +# env: CLANG_VERSION="4.0" BUILD_TYPE="Release" > +# ### LINUX + GCC BUILDS > +# - compiler: gcc > +# env: GCC_VERSION="4.8" BUILD_TYPE="Debug" > +# - compiler: gcc > +# env: GCC_VERSION="4.9" BUILD_TYPE="Debug" > +# - compiler: gcc > +# env: GCC_VERSION="6" BUILD_TYPE="Debug" > - compiler: gcc > env: GCC_VERSION="7" BUILD_TYPE="Debug" > - - compiler: gcc > - env: GCC_VERSION="4.8" BUILD_TYPE="Release" > - - compiler: gcc > - env: GCC_VERSION="4.9" BUILD_TYPE="Release" > - - compiler: gcc > - env: GCC_VERSION="6" BUILD_TYPE="Release" > - - compiler: gcc > - env: GCC_VERSION="7" BUILD_TYPE="Release" > +# - compiler: gcc > +# env: GCC_VERSION="4.8" BUILD_TYPE="Release" > +# - compiler: gcc > +# env: GCC_VERSION="4.9" BUILD_TYPE="Release" > +# - compiler: gcc > +# env: GCC_VERSION="6" BUILD_TYPE="Release" > +# - compiler: gcc > +# env: GCC_VERSION="7" BUILD_TYPE="Release" -- 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. _______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
