From: Peter Rabbitson <ribasushi@cpan.org>
Date: Thu, 7 Feb 2013 05:10:43 +0000 (+0100)
Subject: Reorganize travis stuff a little - no functional changes
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=71dd2ecc010836cbbe91e4bf7d4a84191a41dd39;p=dbsrgits%2FDBIx-Class-Historic.git

Reorganize travis stuff a little - no functional changes
---

diff --git a/maint/travis-ci_scripts/20_install.bash b/maint/travis-ci_scripts/20_install.bash
index f0e3d8e..ace9bc2 100755
--- a/maint/travis-ci_scripts/20_install.bash
+++ b/maint/travis-ci_scripts/20_install.bash
@@ -13,7 +13,7 @@ fi
 export PERL_MM_USE_DEFAULT=1 PERL_MM_NONINTERACTIVE=1 PERL_AUTOINSTALL_PREFER_CPAN=1 PERLBREW_CPAN_MIRROR="$TRAVIS_CPAN_MIRROR"
 
 # Fixup CPANM_OPT to behave more like a traditional cpan client
-export PERL_CPANM_OPT="$( echo $PERL_CPANM_OPT | sed 's/--skip-satisfied//' )"
+export PERL_CPANM_OPT="$( echo $PERL_CPANM_OPT | sed 's/--skip-satisfied//' ) --verbose --no-interactive"
 
 if [[ -n "$BREWVER" ]] ; then
   run_or_err "Compiling/installing Perl $BREWVER (without testing, may take up to 5 minutes)" \
diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index 07b83f0..916e468 100755
--- 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 ;(
diff --git a/maint/travis-ci_scripts/common.bash b/maint/travis-ci_scripts/common.bash
index 73a8b3c..ab5c294 100755
--- a/maint/travis-ci_scripts/common.bash
+++ b/maint/travis-ci_scripts/common.bash
@@ -28,11 +28,18 @@ run_or_err() {
 }
 
 extract_prereqs() {
+  # once --verbose is set, --no-verbose can't disable it
+  # do this by hand
+  ORIG_CPANM_OPT="$PERL_CPANM_OPT"
+  PERL_CPANM_OPT="$( echo $PERL_CPANM_OPT | sed 's/--verbose//' )"
+
   # hack-hack-hack
   LASTEXIT=0
   COMBINED_OUT="$( { stdout="$(cpanm --quiet --scandeps --format tree "$@")" ; } 2>&1; echo "!!!STDERRSTDOUTSEPARATOR!!!$stdout")" \
     || LASTEXIT=$?
 
+  PERL_CPANM_OPT="$ORIG_CPANM_OPT"
+
   OUT=${COMBINED_OUT#*!!!STDERRSTDOUTSEPARATOR!!!}
   ERR=$(grep -v " is up to date." <<< "${COMBINED_OUT%!!!STDERRSTDOUTSEPARATOR!!!*}")
 
@@ -56,7 +63,7 @@ parallel_installdeps_notest() {
   # specify a custom buildlog, hence we just collect the verbose output
   # and display it in case of failure
   run_or_err "Installing (without testing) $MODLIST" \
-    "echo $MODLIST | xargs -n 1 -P $NUMTHREADS cpanm --verbose --no-interactive --notest --no-man-pages"
+    "echo $MODLIST | xargs -n 1 -P $NUMTHREADS cpanm --notest --no-man-pages"
 }