From: Peter Rabbitson <ribasushi@cpan.org>
Date: Mon, 16 Dec 2013 07:42:16 +0000 (+0100)
Subject: Dancing around T::B 1.5 is becoming untenable, just limit it away
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=dd5de10a55fcc4c0f6bcb805f23439f8e3dbdc95;p=dbsrgits%2FDBIx-Class-Historic.git

Dancing around T::B 1.5 is becoming untenable, just limit it away

Also add an extra 5.12.1 clean devrel smoke
---

diff --git a/.travis.yml b/.travis.yml
index 872a4c9..eb8ee38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -156,6 +156,14 @@ matrix:
     ###
     # Start of the allow_failures block
 
+    # minimum threaded with blead CPAN
+    - perl: devcpan_5.8.5_thr
+      env:
+        - CLEANTEST=true
+        - BREWOPTS="-Duseithreads"
+        - BREWVER=5.8.5
+        - DEVREL_DEPS=true
+
     # 5.10.0 threaded with blead CPAN
     - perl: devcpan_5.10.0_thr_mb
       env:
@@ -164,15 +172,15 @@ matrix:
         - BREWVER=5.10.0
         - DEVREL_DEPS=true
 
-    # minimum threaded with blead CPAN
-    - perl: devcpan_5.8.5_thr
+    # 5.12.2 with blead CPAN
+    - perl: devcpan_5.12.2_thr
       env:
         - CLEANTEST=true
         - BREWOPTS="-Duseithreads"
-        - BREWVER=5.8.5
+        - BREWVER=5.12.2
         - DEVREL_DEPS=true
 
-    # recentish stable with blead CPAN
+    # recentish threaded stable with blead CPAN
     - perl: devcpan_5.18.1_thr_mb
       env:
         - CLEANTEST=false
@@ -199,8 +207,9 @@ matrix:
   # which ones of the above can fail
   allow_failures:
     # these run with various dev snapshots - allowed to fail
-    - perl: devcpan_5.10.0_thr_mb
     - perl: devcpan_5.8.5_thr
+    - perl: devcpan_5.10.0_thr_mb
+    - perl: devcpan_5.12.2_thr
     - perl: devcpan_5.18.1_thr_mb
     - perl: bleadperl_thr_mb
     - perl: devcpan_bleadperl_thr_mb
diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index c2faa1a..a6c444e 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -39,15 +39,19 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # So instead we still use our stock (possibly old) CPAN, and add some
   # handholding
 
-  # no configure_requires - we will need the usual suspects anyway
-  # without pre-installign these in one pass things like extract_prereqs won't work
-  CPAN_is_sane || installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build
-
-  # FIXME - need new TB1.5 devrel
-  # if we run under --dev install latest github of TB1.5 first
-  # (unreleased workaround for precedence warnings)
   if [[ "$DEVREL_DEPS" == "true" ]] ; then
-    installdeps git://github.com/nthykier/test-more.git@fix-return-precedence-issue
+    # Many dists still do not pass tests under tb1.5 properly (and it itself
+    # does not even install on things like 5.10). Install the *stable-dev*
+    # latest T::B here, so that it will not show up as a dependency, and
+    # hence it will not get installed a second time as an unsatisfied dep
+    # under cpanm --dev
+    installdeps 'Test::Builder~<1.005'
+
+  elif ! CPAN_is_sane ; then
+    # no configure_requires - we will need the usual suspects anyway
+    # without pre-installign these in one pass things like extract_prereqs won't work
+    installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build
+
   fi
 
 else