Use the same mirror for cpanm as we use for CPAN

[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 a1968b4..d467a4c 100755 (executable)
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -45,9 +45,11 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # possible, mainly to catch "but X is perl core" mistakes
   # So instead we still use our stock (possibly old) CPAN, and add some
   # handholding
-  CPAN_is_sane || \
-    run_or_err "Pre-installing ExtUtils::MakeMaker and Module::Build" \
-      "cpan ExtUtils::MakeMaker Module::Build"
+  if ! CPAN_is_sane ; then
+    for m in ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build ; do
+      run_or_err "Pre-installing $m" "cpan $m"
+    done
+  fi
 
   if ! perl -MModule::Build -e 1 &> /dev/null ; then
     echo_err -e "Module::Build installation failed\n$LASTOUT"
@@ -85,10 +87,9 @@ else
   parallel_installdeps_notest Moose Module::Install JSON SQL::Translator
 
   if [[ -n "DBICTEST_FIREBIRD_DSN" ]] ; then
-    # the official version is full of 5.10-isms, but works perfectly fine on 5.8
-    # pull in our patched copy
+    # pull in patched unreleased copy with restored 5.8 compat
     run_or_err "Fetching patched DBD::Firebird" \
-      "git clone https://github.com/dbsrgits/perl-dbd-firebird-5.8.git ~/dbd-firebird"
+      "git clone https://github.com/mariuz/perl-dbd-firebird ~/dbd-firebird"
 
     # 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):
@@ -96,6 +97,11 @@ else
     run_or_err "Fetching patched DBD::InterBase" \
       "git clone https://github.com/dbsrgits/perl-dbd-interbase ~/dbd-interbase"
 
+    # Now part of DBD::Firebird configure_requires, which are not present
+    # in the cloned repo (no META.*)
+    # FIXME - need to get this off metacpan or something instead
+    parallel_installdeps_notest File::Which
+
     parallel_installdeps_notest ~/dbd-interbase/ ~/dbd-firebird/
   fi
 
@@ -110,12 +116,14 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # we may need to prepend some stuff to that list
   HARD_DEPS="$(echo $(make listdeps))"
 
+
+##### TEMPORARY WORKAROUNDS
+
   # this is a fucked CPAN - won't understand configure_requires of
   # various pieces we may run into
+  # FIXME - need to get these off metacpan or something instead
   CPAN_is_sane || HARD_DEPS="ExtUtils::Depends B::Hooks::OP::Check $HARD_DEPS"
 
-##### TEMPORARY WORKAROUNDS
-
   # The unicode-in-yaml bug on older cpan clients
   # FIXME there got to be a saner way to fix this...
   perl -M5.008008 -e 1 &> /dev/null || \