X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F50_after_success.bash;h=8b44371cb218e8893a649c51bdbc5af27f6972d1;hb=e66f0ee0;hp=4a24b2f58da1800b69bc6957226751a685e1b49e;hpb=01fd95b6c59615ab35fd3c555acb806c95dbfa1c;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/maint/travis-ci_scripts/50_after_success.bash b/maint/travis-ci_scripts/50_after_success.bash
index 4a24b2f..8b44371 100755
--- a/maint/travis-ci_scripts/50_after_success.bash
+++ b/maint/travis-ci_scripts/50_after_success.bash
@@ -7,12 +7,30 @@ if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] || [[ "$TRAVIS_PULL_REQUEST" != "false" ]] ;
 
 # this part needs to run in parallel unconditionally
 export VCPU_USE="$VCPU_AVAILABLE"
+export HARNESS_OPTIONS="j$VCPU_USE"
 
 
 if [[ "$DEVREL_DEPS" == "true" ]] && perl -M5.008003 -e1 &>/dev/null ; then
-  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 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
@@ -33,6 +51,14 @@ if [[ -n "$tarball_assembled" ]] ; then
   # kill as much as possible with fire
   purge_sitelib
 
+
+  # undo some of the pollution (if any) affecting the plain install deps
+  # FIXME - this will go away once we move off Moose, and a new SQLT
+  # with much less recommends ships
+  export DBICTEST_SQLT_DEPLOY=""
+  export DBICTEST_VIA_REPLICATED=""
+
+
   # make sure we are retrying with newest CPAN possible
   #
   # not running tests on CPAN.pm - they are not terribly slow,
@@ -56,6 +82,8 @@ if [[ -n "$tarball_assembled" ]] ; then
 
   cd "$(find DBIx-Class-* -maxdepth 0 -type d | head -n 1)"
 
+  # only run a full test cycle on devrel_deps, as they are all marked
+  # as "allow fails" in the travis matrix
   if [[ "$DEVREL_DEPS" == "true" ]] ; then
 
     for e in $( env | grep 'DBICTEST.*DSN' | cut -f 1 -d '=' ) ; do
@@ -63,9 +91,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 \