X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F50_after_success.bash;h=69feec202c29aeb16d4887573fcbb41e452c7539;hb=d296da9b7155fe8e9e0e778c73f26abc18e480af;hp=a7b78dd7e877da286a151cf6139df1468ae8ba37;hpb=afb8fc5295f37e051ab76636d1f73538f42edc08;p=dbsrgits%2FDBIx-Class.git

diff --git a/maint/travis-ci_scripts/50_after_success.bash b/maint/travis-ci_scripts/50_after_success.bash
index a7b78dd..69feec2 100755
--- a/maint/travis-ci_scripts/50_after_success.bash
+++ b/maint/travis-ci_scripts/50_after_success.bash
@@ -3,15 +3,87 @@
 # this file is executed in a subshell - set up the common stuff
 source maint/travis-ci_scripts/common.bash
 
-if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then exit 0 ; fi
+if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] || [[ "$TRAVIS_PULL_REQUEST" != "false" ]] ; then exit 0 ; fi
 
-if [[ "$CLEANTEST" != "true" ]] ; then
+# 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
+  # 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"
+  tarball_assembled=1
+
+elif [[ "$CLEANTEST" != "true" ]] ; then
   parallel_installdeps_notest $(perl -Ilib -MDBIx::Class::Optional::Dependencies=-list_missing,dist_dir)
-  run_or_err "Attempt to build a dist with all prereqs present" "make dist"
+
+  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:"
   echo "==========================================="
   tar -vzxf DBIx-Class-*.tar.gz
   echo "==========================================="
-  run_or_err 'Attempt to configure from re-extracted distdir' \
-    'bash -c "cd \$(find DBIx-Class-* -maxdepth 0 -type d | head -n 1) && perl Makefile.PL"'
+
+  # 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,
+  # but https://rt.cpan.org/Ticket/Display.html?id=96437 sucks
+  parallel_installdeps_notest CPAN
+  run_or_err "Make sure CPAN was upgraded to at least 2.10" "perl -M'CPAN 2.010' -e1"
+
+  run_or_err "Re-Configuring CPAN.pm" "perl -MCPAN -e '\
+    CPAN::Config->load;
+
+    # For the time being smoking with this setting is not realistic
+    # https://rt.cpan.org/Ticket/Display.html?id=103280
+    # https://rt.cpan.org/Ticket/Display.html?id=37641
+    # https://rt.cpan.org/Ticket/Display.html?id=77708
+    # https://rt.cpan.org/Ticket/Display.html?id=87474
+    #\$CPAN::Config->{build_requires_install_policy} = q{no};
+
+    \$CPAN::Config->{recommends_policy} = q{yes};
+    CPAN::Config->commit;
+  '"
+
+  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
+      echo "Unsetting $e"
+      export $e=""
+    done
+
+    run_or_err \
+      "Attempt to configure/test/build/install dist using latest CPAN@$(perl -MCPAN -e 'print CPAN->VERSION')" \
+      "cpan ."
+
+  else
+    run_or_err \
+      "Attempt to configure/build/install dist using latest CPAN@$(perl -MCPAN -e 'print CPAN->VERSION')" \
+      "perl -MCPAN -e 'notest( install => q{.} )'"
+  fi
 fi