[travis] Fail build if coveralls fails

diff --git a/.travis.yml b/.travis.yml
index 548f26e..702fea0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ env:
     - CFLAGS="-Werror --coverage"
     - CXXFLAGS="-Werror --coverage"
     - LDFLAGS="--coverage"
-before_install:
+install:
   - sudo apt-get install pkg-config ragel gtk-doc-tools # for autogen.sh
   - sudo apt-get install libfreetype6-dev # for font functions
   - sudo apt-get install libglib2.0-dev # for font functions / tests / utils
@@ -16,21 +16,10 @@ before_install:
   - sudo apt-get install libicu-dev # for extra unicode functions
   - sudo apt-get install libgraphite2-dev # for extra shapers
   - sudo pip install cpp-coveralls # for coveralls.io code coverage tracking
-install:
-  - true
-before_script:
-  - true
 script:
   - NOCONFIGURE=1 ./autogen.sh
   - ./configure --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2
-  - make && make check
-after_success:
-  - rm -f src/.libs/NONE.gcov; touch src/NONE # coveralls needs some help
-  - if test $CC == gcc; then coveralls; fi # currently only gcc works
-after_failure:
-  - true
-after_script:
-  - true
+  - make && make check && { rm -f src/.libs/NONE.gcov && touch src/NONE && test $CC == gcc && coveralls; }
 notifications:
   irc: "irc.freenode.org#harfbuzz"
   email: harfbuzz@lists.freedesktop.org