(travis) Revert 17b09b77 - Test::Deep 0.115 now available

[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 85c8a09..2012f4b 100755 (executable)
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -57,9 +57,6 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # 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'
@@ -72,12 +69,6 @@ if [[ "$CLEANTEST" = "true" ]]; then
       installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build
     fi
 
-    # FIXME - temporary until 1.46 comes out / RT#99747 is fixed
-    # insufficient testing of 5.8.3, ned older DBD::SQlite, ribasushi--
-    if ! perl -M5.008004 -e 1 &>/dev/null ; then
-      installdeps DBI I/IS/ISHIGAKI/DBD-SQLite-1.42.tar.gz
-    fi
-
   fi
 
 else
@@ -96,7 +87,7 @@ else
   parallel_installdeps_notest Test::Exception Encode::Locale Test::Fatal
   parallel_installdeps_notest Test::Warn B::Hooks::EndOfScope Test::Differences HTTP::Status
   parallel_installdeps_notest Test::Pod::Coverage Test::EOL Devel::GlobalDestruction Sub::Name MRO::Compat Class::XSAccessor URI::Escape HTML::Entities
-  parallel_installdeps_notest YAML LWP Class::Trigger JSON::XS DateTime::Format::Builder Class::Accessor::Grouped Package::Variant
+  parallel_installdeps_notest YAML LWP Class::Trigger DateTime::Format::Builder Class::Accessor::Grouped Package::Variant
   parallel_installdeps_notest SQL::Abstract Moose Module::Install JSON SQL::Translator File::Which
 
   # the official version is very much outdated and does not compile on 5.14+
@@ -120,19 +111,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"