X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F30_before_script.bash;h=2f6172094c5dcc540f9fac1a5a1d90c8ef544d78;hb=c26b30dee587fa008f7d956b61ae27c36ac7ec82;hp=b13fda727c5112b4b026a717eb74f9ab6a99d604;hpb=45db0adc8afbd7c42aa8b9bf18a43feb4369bacc;p=dbsrgits%2FDBIx-Class.git

diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index b13fda7..2f61720 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -56,22 +56,10 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # So instead we still use our stock (possibly old) CPAN, and add some
   # handholding
 
-  if [[ "$DEVREL_DEPS" == "true" ]] ; then
-    # FIXME - temporary workaround for https://github.com/rjbs/Test-Deep/issues/22
-    installdeps R/RJ/RJBS/Test-Deep-0.113.tar.gz
-
-    # We are not "quite ready" for SQLA 1.99, do not consider it
-    #
-    installdeps 'SQL::Abstract~<1.99'
-
-  else
-
-    if ! CPAN_is_sane ; then
-      # no configure_requires - we will need the usual suspects anyway
-      # without pre-installing these in one pass things like extract_prereqs won't work
-      installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build
-    fi
-
+  if [[ "$DEVREL_DEPS" != "true" ]] && ! CPAN_is_sane ; then
+    # no configure_requires - we will need the usual suspects anyway
+    # without pre-installing these in one pass things like extract_prereqs won't work
+    installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build
   fi
 
 else
@@ -114,19 +102,13 @@ if [[ "$CLEANTEST" = "true" ]]; then
 
     HARD_DEPS="$(echo $(make listalldeps))"
 
-    # FIXME - temporary workaround for https://github.com/rjbs/Test-Deep/issues/22
-    HARD_DEPS="$(sed 's/Test::Deep//' <<< $HARD_DEPS)"
-
   else
 
-    HARD_DEPS="$(echo $(make listdeps))"
+    HARD_DEPS="$(echo $(make listdeps | sort -R))"
 
 ##### TEMPORARY WORKAROUNDS needed in case we will be using a fucked CPAN.pm
     if ! CPAN_is_sane ; then
 
-      # FIXME - temporary workaround for https://github.com/rjbs/Test-Deep/issues/22
-      HARD_DEPS="R/RJ/RJBS/Test-Deep-0.113.tar.gz $HARD_DEPS"
-
       # DBD::SQLite reasonably wants DBI at config time
       perl -MDBI -e1 &>/dev/null || HARD_DEPS="DBI $HARD_DEPS"