A git based install works in one step with cpanm

[dbsrgits/DBIx-Class.git] / maint / travis-ci_scripts / 30_before_script.bash

diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index c2faa1a..01d879a 100755 (executable)
--- 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
@@ -82,10 +86,7 @@ else
     # the official version is very much outdated and does not compile on 5.14+
     # use this rather updated source tree (needs to go to PAUSE):
     # https://github.com/pilcrow/perl-dbd-interbase
-    run_or_err "Fetching patched DBD::InterBase" \
-      "git clone https://github.com/dbsrgits/perl-dbd-interbase ~/dbd-interbase"
-
-    parallel_installdeps_notest ~/dbd-interbase/
+    parallel_installdeps_notest git://github.com/dbsrgits/perl-dbd-interbase.git
   fi
 
 fi