Move bleadperl to 'fail ok' submatrix - too much churn

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

diff --git a/.travis.yml b/.travis.yml
index fcf7acc..1438706 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,19 +30,15 @@
 #
 
 #
-# Smoke only specific branches to a) not overload the queue and b) not
-# overspam the notification channels
+# Smoke all branches except for blocked* and wip/*
 #
-# Furthermore if the branch is ^topic/ - the custom compiled smokes will
-# not run at all, again in order to conserve queue resources
-#
-# Additionally bleadperl tests do not run on master (but do run on smoke/*)
+# Additionally master does not smoke with bleadperl
+# ( implemented in maint/travis-ci_scripts/10_before_install.bash )
 #
 branches:
-  only:
-    - master
-    - /^smoke\//
-    - /^topic\//
+  except:
+    - /^wip\//
+    - /^blocked/
 
 notifications:
   irc:
@@ -60,12 +56,12 @@ notifications:
       # 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
+    on_failure: always
 
 language: perl
 
 perl:
-  - "5.16"
+  - "5.18"
 
 env:
   - CLEANTEST=false
@@ -73,19 +69,13 @@ env:
 
 matrix:
   include:
-    # bleadperl
-    - perl: bleadperl_thr_mb
-      env:
-        - CLEANTEST=false
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=blead
-
     # minimum supported with threads
     - perl: 5.8.5_thr
       env:
         - CLEANTEST=false
         - BREWOPTS="-Duseithreads"
         - BREWVER=5.8.5
+        - DBIC_TRACE_PROFILE=console
 
     # minimum supported without threads
     - perl: 5.8.3_nt
@@ -93,6 +83,7 @@ matrix:
         - CLEANTEST=false
         - BREWOPTS=""
         - BREWVER=5.8.3
+        - DBIC_TRACE_PROFILE=console_monochrome
 
     # check CLEANTEST of minimum supported
     - perl: 5.8.3_nt_mb
@@ -115,6 +106,42 @@ matrix:
         - BREWOPTS="-Duseithreads -Dusemorebits"
         - BREWVER=5.8.8
 
+    # some permutations of tracing and envvar poisoning
+    - perl: 5.18
+      env:
+        - CLEANTEST=false
+        - POISON_ENV=true
+
+    - perl: 5.18
+      env:
+        - CLEANTEST=true
+        - POISON_ENV=true
+        - DBIC_TRACE=1
+        - DBIC_TRACE_PROFILE=console
+
+    - perl: 5.18
+      env:
+        - CLEANTEST=false
+        - POISON_ENV=true
+        - DBIC_TRACE=1
+        - DBIC_TRACE_PROFILE=console_monochrome
+
+    ###
+    # Start of the allow_failures block
+
+    # bleadperl
+    - perl: bleadperl_thr_mb
+      env:
+        - CLEANTEST=false
+        - BREWOPTS="-Duseithreads -Dusemorebits"
+        - BREWVER=blead
+
+
+  # which ones of the above can fail
+  allow_failures:
+    - perl: bleadperl_thr_mb
+
+
 # sourcing the files is *EXTREMELY* important - otherwise
 # no envvars will survive