Reorganize travis stuff a little - no functional changes

[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 5351080..916e468 100755 (executable)
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -97,9 +97,11 @@ if [[ "$CLEANTEST" = "true" ]]; then
 
 ##### TEMPORARY WORKAROUNDS
 
-  # not sure what's going on here yet
+  # 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 || \
-    parallel_installdeps_notest multidimensional bareword::filehandles
+     run_or_err "Installing multidimensional and bareword::filehandles via cpanm" \
+        "cpanm multidimensional bareword::filehandles"
 
   # work around Params::Validate not having a Makefile.PL so really old
   # toolchains can not figure out what the prereqs are ;(
@@ -109,7 +111,7 @@ if [[ "$CLEANTEST" = "true" ]]; then
 
 ##### END TEMPORARY WORKAROUNDS
 
-  run_or_err "Installing/testing dependencies (may take up to 10 minutes): $HARD_DEPS" "cpan $HARD_DEPS"
+  run_or_err "Installing/testing dependencies (may take up to 3 minutes): $HARD_DEPS" "cpan $HARD_DEPS"
 
   # this is a fucked CPAN - save the log as we may need it
   CPAN_is_sane || INSTALLDEPS_OUT="$LASTOUT"