More information about the test env we are about to use

[dbsrgits/DBIx-Class-Historic.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 3abc1d7..81f5e85 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,13 +23,15 @@
 # WONTFIX "explanation") here: https://github.com/travis-ci/travis-ci/issues/497
 #
 
-# smoke only specific branches to a) not overload the queue and b) not
+# Smoke only specific branches to a) not overload the queue and b) not
 # overspam the notification channels
+# Furthermore if the branch is ^topic/ - the custom compiled smokes will
+# not run at all, again in order to conserve queue resources
 branches:
   only:
     - master
-    - /^topic\//
     - /^smoke\//
+    - /^topic\//
 
 notifications:
   irc:
@@ -42,9 +44,12 @@ notifications:
     use_notice: true
 
   email:
-    - ribasushi@cpan.org
-    # Temporary - if it proves to be too noisy, we'll shut it off
-    - dbix-class-devel@lists.scsys.co.uk
+    recipients:
+      - ribasushi@cpan.org
+      # Temporary - if it proves to be too noisy, we'll shut it off
+      #- dbix-class-devel@lists.scsys.co.uk
+    on_success: change
+    on_failure: change
 
 language: perl
 
@@ -85,7 +90,6 @@ matrix:
         - BREWOPTS="-Duseithreads -Dusemorebits"
         - BREWVER=5.8.8
 
-
 before_install:
   # Do not make this part of the env-matrix
   # different boxes we run on have different amount of hw threads
@@ -103,7 +107,9 @@ install:
   - source maint/travis-ci_prepare_env
 
 script:
-  # either a plain 'make test' OR a shuffled prove torture
   - export HARNESS_TIMER=1 HARNESS_OPTIONS=c:j$NUMTHREADS
+
+  # either a plain 'make test' OR a shuffled prove torture
   # use the random order test plan unless CLEANTEST
-  - test "$CLEANTEST" = "true" && make test || prove -lrswj$NUMTHREADS t xt
+  # prepare_env may have short-circuited the test entirely
+  - test -n "$SHORT_CIRCUIT_SMOKE" || (test "$CLEANTEST" = "true" && make test || prove -lrswj$NUMTHREADS t xt)