diff --git a/.travis.yml b/.travis.yml index 361122a0..e32b0703 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,26 @@ +# http://docs.travis-ci.com/user/build-configuration/ language: cpp compiler: - gcc - clang +#branches: +# only: +# - master before_install: - - sudo apt-get update -qq # UPDATE REPOS - #- free -m - #- df -h - - sudo mk/linux/setupBuildDeps.sh --quiet # INSTALL DEPENDENCIES HERE + - sudo apt-get update -qq # UPDATE REPOS + - sudo mk/linux/setupBuildDeps.sh --quiet # INSTALL DEPENDENCIES HERE script: # ALL THE BUILD COMMANDS HERE - - mk/linux/build-mg.sh -c 4 - #- dmesg + - mk/linux/build-mg.sh -c 4 notifications: irc: channels: - "irc.freenode.org#megaglest" - template: - - "[%{commit} : %{author}] %{message}" - - "%{build_url}" - use_notice: true skip_join: true + use_notice: true + template: + #- "[%{commit}: %{author}] %{message}" + #- "%{build_url}" + - "[%{repository}#%{branch} @%{commit}] %{author}): %{message}" + - "Diff: %{compare_url}" + - "Build: %{build_url}" diff --git a/data/glest_game b/data/glest_game index 28765fb9..4148a9e4 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 28765fb9baf715ab5adea9b71d12415464c2f0c7 +Subproject commit 4148a9e4d7e62270edb2c07174606cbc03561330