(travis) Port all travis changes since last release

[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 fdb6a64..8b44371 100755 (executable)
--- a/maint/travis-ci_scripts/50_after_success.bash
+++ b/maint/travis-ci_scripts/50_after_success.bash
@@ -9,7 +9,11 @@ if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] || [[ "$TRAVIS_PULL_REQUEST" != "false" ]] ;
 export VCPU_USE="$VCPU_AVAILABLE"
 export HARNESS_OPTIONS="j$VCPU_USE"
 
+
 if [[ "$DEVREL_DEPS" == "true" ]] && perl -M5.008003 -e1 &>/dev/null ; then
+
+  [[ "$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
@@ -23,21 +27,20 @@ if [[ "$DEVREL_DEPS" == "true" ]] && perl -M5.008003 -e1 &>/dev/null ; then
     parallel_installdeps_notest YAML Lexical::SealRequireHints
   fi
 
-  parallel_installdeps_notest "Module::Install@1.15"
-
   # FIXME Change when Moose goes away
-  installdeps Moose $(perl -Ilib -MDBIx::Class -e 'print join " ", keys %{DBIx::Class::Optional::Dependencies->req_list_for("dist_dir")}')
+  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 --skip-author-deps && make dist"
+  run_or_err "Attempt to build a dist" "rm -rf inc/ && perl Makefile.PL && make dist"
   tarball_assembled=1
 
 elif [[ "$CLEANTEST" != "true" ]] ; then
-  parallel_installdeps_notest "Module::Install@1.15" $(perl -Ilib -MDBIx::Class -e 'print join " ", keys %{DBIx::Class::Optional::Dependencies->req_list_for("dist_dir")}')
+  parallel_installdeps_notest $(perl -Ilib -MDBIx::Class::Optional::Dependencies=-list_missing,dist_dir)
 
   run_or_err "Attempt to build a dist from original checkout" "make dist"
   tarball_assembled=1
 fi
 
+
 if [[ -n "$tarball_assembled" ]] ; then
 
   echo "Contents of the resulting dist tarball:"
@@ -88,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 \