diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-03 08:41:41 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-04 16:50:30 -0700 |
| commit | d53f69d2249120b366b15a2333110372d67fbb5b (patch) | |
| tree | ec27647907a126e58563828a2ff664c6423a2093 /.travis.yml | |
| parent | 5586980e438bc52bf0e5f6c7b662d36d95b48f17 (diff) | |
| download | tmwa-d53f69d2249120b366b15a2333110372d67fbb5b.tar.gz tmwa-d53f69d2249120b366b15a2333110372d67fbb5b.tar.bz2 tmwa-d53f69d2249120b366b15a2333110372d67fbb5b.tar.xz tmwa-d53f69d2249120b366b15a2333110372d67fbb5b.zip | |
Fix travis
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index c36c00f..913db19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ before_script: script: - mkdir build - cd build + - git init - ../configure --dev CPPFLAGS=-DQUIET `! [[ $CXX =~ clang* ]] || echo --disable-abi6` - make -R -k -j2 - make -R -k -j2 test TESTER='valgrind --error-exitcode=1 --track-fds=yes' @@ -54,7 +55,8 @@ script: ## Do something after the main test script after_script: - make -R -k -j2 format - - git diff --exit-code + - git --git-dir=../.git --work-tree=.. diff --exit-code + - make -R -k -j2 dist ### The rest of the file creates a build matrix ### containing gcc-4.6 through gcc-4.8 and clang-3.1 through clang-3.3 @@ -95,6 +97,9 @@ matrix: # everything that was pushed to master was already on 'test', except # the version change and some doc changes. +# As of the next release, current 'master' will become 'stable' and current +# 'test' will become 'master' (now that 'test' doesn't crash all the time) branches: except: - master + - stable |