(travis) Work around RT#113740

[dbsrgits/DBIx-Class.git] / maint / travis-ci_scripts / 50_after_success.bash

diff --git a/maint/travis-ci_scripts/50_after_success.bash b/maint/travis-ci_scripts/50_after_success.bash
index 69feec2..3d3451f 100755 (executable)
--- a/maint/travis-ci_scripts/50_after_success.bash
+++ b/maint/travis-ci_scripts/50_after_success.bash
@@ -11,12 +11,29 @@ export HARNESS_OPTIONS="j$VCPU_USE"
 
 
 if [[ "$DEVREL_DEPS" == "true" ]] && perl -M5.008003 -e1 &>/dev/null ; then
-  # FIXME - these really need to be installed *with* testing under "allowed failures"
-  # Change when Moose goes away
-  parallel_installdeps_notest Moose
-  parallel_installdeps_notest $(perl -Ilib -MDBIx::Class::Optional::Dependencies=-list_missing,dist_dir)
 
-  run_or_err "Attempt to build a dist" "rm -rf inc/ && perl Makefile.PL --skip-author-deps && make dist"
+  [[ "$BREAK_CC" == "true" ]] && run_or_err "Unbreaking previously broken ~/bin/cc" "rm $HOME/bin/cc"
+
+  # FIXME - Devel::Cover (brought by Test::Strict, but soon needed anyway)
+  # does not test cleanly on 5.8.7 - just get it directly
+  if perl -M5.008007 -e1 &>/dev/null && ! perl -M5.008008 -e1 &>/dev/null; then
+    parallel_installdeps_notest Devel::Cover
+  fi
+
+  # FIXME - workaround for YAML/RT#81120 and L::SRH/RT#107681
+  # We don't actually need these modules, only there because of SQLT (which will be fixed)
+  # does not test cleanly on 5.8.7 - just get them directly
+  if ! perl -M5.008008 -e1 &>/dev/null; then
+    parallel_installdeps_notest YAML Lexical::SealRequireHints
+  fi
+
+  # FIXME - workaround for RT#113740
+  parallel_installdeps_notest List::AllUtils
+
+  # FIXME Change when Moose goes away
+  installdeps Moose $(perl -Ilib -MDBIx::Class::Optional::Dependencies=-list_missing,dist_dir)
+
+  run_or_err "Attempt to build a dist" "rm -rf inc/ && perl Makefile.PL && make dist"
   tarball_assembled=1
 
 elif [[ "$CLEANTEST" != "true" ]] ; then
@@ -77,9 +94,11 @@ if [[ -n "$tarball_assembled" ]] ; then
       export $e=""
     done
 
+    # FIXME - for some reason a plain `cpan .` does not work in this case
+    # no time to investigate
     run_or_err \
       "Attempt to configure/test/build/install dist using latest CPAN@$(perl -MCPAN -e 'print CPAN->VERSION')" \
-      "cpan ."
+      "perl -MCPAN -e 'install( q{.} )'"
 
   else
     run_or_err \