X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=.travis.yml;h=047a5824b05438044f9ce55b298c6a6946cd01e9;hb=2b32a0200f177727ed4d28d6bdc70d269226b85f;hp=0b32eb00d6c33e04fccd594a2960c58e3b03a77b;hpb=8bc629c4c91cf72b2f8d555a7a76dd8a81c30bf8;p=dbsrgits%2FDBIx-Class.git

diff --git a/.travis.yml b/.travis.yml
index 0b32eb0..047a582 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,16 +58,24 @@ notifications:
     on_success: change
     on_failure: always
 
+# FIXME - This stuff is not yet available for free OSS accounts, sadpanda
+# First paragrah on http://about.travis-ci.org/docs/user/caching/
+#cache:
+#  apt: true
+#  directories:
+#    - /var/cache/apt/archives
+
 language: perl
 
 perl:
-  - "5.18"
+  - "5.20-extras"
 
 env:
   - CLEANTEST=false
   - CLEANTEST=true
 
 matrix:
+  fast_finish: true
   include:
     # this particular perl is quite widespread
     - perl: 5.8.8_thr_mb
@@ -116,29 +124,29 @@ matrix:
     ###
     # some permutations of tracing and envvar poisoning
 
-    - perl: 5.18.1_thr_mb
+    - perl: 5.16.3_thr_mb
       env:
         - CLEANTEST=false
         - POISON_ENV=true
         - DBIC_TRACE=1
         - DBIC_MULTICREATE_DEBUG=0
         - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=5.18.1
+        - BREWVER=5.16.3
 
-    - perl: 5.18
+    - perl: 5.20-extras
       env:
         - CLEANTEST=false
         - POISON_ENV=true
         - DBIC_TRACE_PROFILE=console
 
-    - perl: 5.18
+    - perl: 5.8
       env:
         - CLEANTEST=true
         - POISON_ENV=true
         - DBIC_TRACE=1
         - DBIC_TRACE_PROFILE=console
 
-    - perl: 5.18
+    - perl: 5.18-extras
       env:
         - CLEANTEST=false
         - POISON_ENV=true
@@ -149,19 +157,42 @@ matrix:
     ###
     # Start of the allow_failures block
 
-    # recentish stable with blead CPAN
-    - perl: devcpan_5.18.1_thr_mb
+    # old threaded with blead CPAN
+    - perl: devcpan_5.8.7_thr
       env:
-        - CLEANTEST=false
+        - CLEANTEST=true
+        - BREWOPTS="-Duseithreads"
+        - BREWVER=5.8.7
+        - DEVREL_DEPS=true
+
+    # 5.10.0 threaded with blead CPAN
+    - perl: devcpan_5.10.0_thr_mb
+      env:
+        - CLEANTEST=true
         - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=5.18.1
+        - BREWVER=5.10.0
         - DEVREL_DEPS=true
 
-    # bleadperl with stock CPAN
-    - perl: bleadperl_thr_mb
+    # 5.12.2 with blead CPAN
+    - perl: devcpan_5.12.2_thr
+      env:
+        - CLEANTEST=true
+        - BREWOPTS="-Duseithreads"
+        - BREWVER=5.12.2
+        - DEVREL_DEPS=true
+
+    # recentish threaded stable with blead CPAN
+    - perl: devcpan_5.18.2_thr_mb
       env:
         - CLEANTEST=false
         - BREWOPTS="-Duseithreads -Dusemorebits"
+        - BREWVER=5.18.2
+        - DEVREL_DEPS=true
+
+    # bleadperl with stock CPAN, full depchain test
+    - perl: bleadperl
+      env:
+        - CLEANTEST=true
         - BREWVER=blead
 
     # bleadperl with blead CPAN
@@ -176,13 +207,12 @@ matrix:
   # which ones of the above can fail
   allow_failures:
 
-    # Fails tests because of https://github.com/Perl-Toolchain-Gang/CPAN-Meta/issues/25
-    # Can't be simply masked due to https://rt.cpan.org/Ticket/Display.html?id=88903
-    - perl: 5.10.0_thr_dbg
-
     # these run with various dev snapshots - allowed to fail
-    - perl: devcpan_5.18.1_thr_mb
-    - perl: bleadperl_thr_mb
+    - perl: devcpan_5.8.7_thr
+    - perl: devcpan_5.10.0_thr_mb
+    - perl: devcpan_5.12.2_thr
+    - perl: devcpan_5.18.2_thr_mb
+    - perl: bleadperl
     - perl: devcpan_bleadperl_thr_mb
 
 
@@ -193,6 +223,9 @@ matrix:
 # console output
 
 before_install:
+  # common functions for all run phases below
+  - source maint/travis-ci_scripts/common.bash
+
   # Sets global envvars, downloads/configures debs based on CLEANTEST
   # Sets extra DBICTEST_* envvars
   #