From: Peter Rabbitson <ribasushi@cpan.org>
Date: Thu, 2 Apr 2015 00:37:19 +0000 (+0200)
Subject: (travis) Restore proper post-success testing
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6bb14e9bcb10e0c64a3d4b8ee4c600b34ec12f12;p=dbsrgits%2FDBIx-Class-Historic.git

(travis) Restore proper post-success testing

The functionality was silently lost due to TravisCI issue #3533
---

diff --git a/.travis.yml b/.travis.yml
index f036df1..9fe3eac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -275,6 +275,11 @@ script:
   #
   - maint/getstatus maint/travis-ci_scripts/40_script.bash
 
+###
+### Set -e back, work around https://github.com/travis-ci/travis-ci/issues/3533
+###
+  - set -e
+
 after_success:
   # Check if we can assemble a dist properly if not in CLEANTEST
   #
diff --git a/maint/travis-ci_scripts/common.bash b/maint/travis-ci_scripts/common.bash
index f44b36e..faf47de 100755
--- a/maint/travis-ci_scripts/common.bash
+++ b/maint/travis-ci_scripts/common.bash
@@ -190,10 +190,10 @@ _dep_inst_with_test() {
   if [[ "$DEVREL_DEPS" == "true" ]] ; then
     # --dev is already part of CPANM_OPT
     LASTCMD="$TIMEOUT_CMD cpanm $@"
-    $LASTCMD 2>&1
+    $LASTCMD 2>&1 || return 1
   else
     LASTCMD="$TIMEOUT_CMD cpan $@"
-    $LASTCMD 2>&1
+    $LASTCMD 2>&1 || return 1
 
     # older perls do not have a CPAN which can exit with error on failed install
     for m in "$@"; do