(travis) Work around RT#107392

[dbsrgits/DBIx-Class.git] / maint / travis-ci_scripts / 30_before_script.bash

diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index a2b96cc..85d5fa8 100755 (executable)
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -38,10 +38,11 @@ if [[ "$POISON_ENV" = "true" ]] ; then
 
     # Clone and P::S::XS are both bugs
     # File::Spec can go away as soon as I dump Path::Class
+    # File::Path is there because of RT#107392 (sigh)
     # List::Util can be excised after that as well (need to make my own max() routine for older perls)
 
     installdeps Sub::Name Clone Package::Stash::XS \
-                $( perl -MFile::Spec\ 3.26 -e1 &>/dev/null || echo "File::Spec" ) \
+                $( perl -MFile::Spec\ 3.26 -e1 &>/dev/null || echo "File::Path File::Spec" ) \
                 $( perl -MList::Util\ 1.16 -e1 &>/dev/null || echo "List::Util" )
 
     mkdir -p "$HOME/bin" # this is already in $PATH, just doesn't exist
@@ -114,11 +115,11 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # we are doing a devrel pass - try to upgrade *everything* (we will be using cpanm so safe-ish)
   if [[ "$DEVREL_DEPS" == "true" ]] ; then
 
-    HARD_DEPS="$(echo $(make listalldeps))"
+    HARD_DEPS="$(make listalldeps | sort -R)"
 
   else
 
-    HARD_DEPS="$(echo $(make listdeps | sort -R))"
+    HARD_DEPS="$(make listdeps | sort -R)"
 
 ##### TEMPORARY WORKAROUNDS needed in case we will be using a fucked CPAN.pm
     if ! CPAN_is_sane ; then
@@ -135,7 +136,7 @@ if [[ "$CLEANTEST" = "true" ]]; then
 
 else
 
-  parallel_installdeps_notest "$(make listdeps)"
+  parallel_installdeps_notest "$(make listdeps | sort -R)"
 
 fi
 
@@ -159,6 +160,10 @@ if [[ "$POISON_ENV" = "true" ]] && ( perl -MDBD::SQLite\ 1.38 -e1 || perl -MDBI\
   exit 1
 fi
 
+if [[ "$CLEANTEST" = "true" ]] && perl -MModule::Build::Tiny -e1 &>/dev/null ; then
+  echo_err "Module::Build::Tiny pulled in during the basic depchain install - this must not happen"
+  exit 1
+fi
 
 # announce what are we running
 echo_err "