X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F30_before_script.bash;h=10f380c29d5b2db1606b4258b188b222dd18f921;hb=2b58042054a403c50d8b1d6aad89491d35c127bb;hp=47a1927ab6ca8246db1f47929f9238bfa3d2ab2c;hpb=647da28e487e48e78ba40aede9f5a485ef8725d0;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 47a1927..10f380c 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -30,6 +30,26 @@ if [[ "$POISON_ENV" = "true" ]] ; then
 
   # perldoc -l <mod> searches $(pwd)/lib in addition to PERL5LIB etc, hence the cd /
   echo_err "Latest stable DBIC (without deps) locatable via \$PERL5LIB at $(cd / && perldoc -l DBIx::Class)"
+
+  # FIXME - this is a kludge in place of proper MDV testing. For the time
+  # being simply use the minimum versions of our DBI/DBDstack, to avoid
+  # fuckups like 0.08260 (went unnoticed for 5 months)
+  #
+  # use url-spec for DBI due to https://github.com/miyagawa/cpanminus/issues/328
+  if perl -M5.013003 -e1 &>/dev/null ; then
+    # earlier DBI will not compile without PERL_POLLUTE which was gone in 5.14
+    parallel_installdeps_notest T/TI/TIMB/DBI-1.614.tar.gz
+  else
+    parallel_installdeps_notest T/TI/TIMB/DBI-1.57.tar.gz
+  fi
+
+  # Test both minimum DBD::SQLite and minimum BigInt SQLite
+  if [[ "$CLEANTEST" = "true" ]]; then
+    parallel_installdeps_notest DBD::SQLite@1.37
+  else
+    parallel_installdeps_notest DBD::SQLite@1.29
+  fi
+
 fi
 
 if [[ "$CLEANTEST" = "true" ]]; then
@@ -60,13 +80,14 @@ if [[ "$CLEANTEST" = "true" ]]; then
     # hence it will not get installed a second time as an unsatisfied dep
     # under cpanm --dev
     #
-    # L::U is a workaround for RT#92226 (argh)
-    installdeps 'Test::Builder~<1.005' 'List::Util~!=1.36'
+    # We are also not "quite ready" for SQLA 1.99, do not consider it
+    #
+    installdeps 'Test::Builder~<1.005' 'SQL::Abstract~<1.99'
 
   elif ! 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 P/PE/PEVANS/Scalar-List-Utils-1.35.tar.gz
+    installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build
 
   fi
 
@@ -91,14 +112,14 @@ else
   parallel_installdeps_notest File::Path
   parallel_installdeps_notest Carp
   parallel_installdeps_notest Module::Build
-  parallel_installdeps_notest File::Spec Data::Dumper Module::Runtime 'List::Util~<1.36'
+  parallel_installdeps_notest File::Spec Data::Dumper Module::Runtime
   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 DBI DateTime::Format::Builder Class::Accessor::Grouped Package::Variant
-  parallel_installdeps_notest Moose Module::Install JSON SQL::Translator File::Which
+  parallel_installdeps_notest YAML LWP Class::Trigger JSON::XS DateTime::Format::Builder Class::Accessor::Grouped Package::Variant
+  parallel_installdeps_notest 'SQL::Abstract~<1.99' Moose Module::Install JSON SQL::Translator File::Which
 
-  if [[ -n "DBICTEST_FIREBIRD_DSN" ]] ; then
+  if [[ -n "$DBICTEST_FIREBIRD_INTERBASE_DSN" ]] ; then
     # the official version is very much outdated and does not compile on 5.14+
     # use this rather updated source tree (needs to go to PAUSE):
     # https://github.com/pilcrow/perl-dbd-interbase
@@ -120,14 +141,14 @@ if [[ "$CLEANTEST" = "true" ]]; then
   if [[ "$DEVREL_DEPS" != "true" ]] && ! CPAN_is_sane ; then
     # combat dzillirium on harness-wide level, otherwise breakage happens weekly
     echo_err "$(tstamp) Ancient CPAN.pm: engaging TAP::Harness::IgnoreNonessentialDzilAutogeneratedTests during dep install"
-    perl -MTAP::Harness=3.18 -e1 &>/dev/null || run_or_err "Upgrading TAP::Harness for HARNESS_SUBCLASS support" "cpan TAP::Harness"
+    perl -MTAP::Harness\ 3.18 -e1 &>/dev/null || run_or_err "Upgrading TAP::Harness for HARNESS_SUBCLASS support" "cpan TAP::Harness"
     export PERL5LIB="$(pwd)/maint/travis-ci_scripts/lib:$PERL5LIB"
     export HARNESS_SUBCLASS="TAP::Harness::IgnoreNonessentialDzilAutogeneratedTests"
     # sanity check, T::H does not report sensible errors when the subclass fails to load
     perl -MTAP::Harness::IgnoreNonessentialDzilAutogeneratedTests -e1
 
     # DBD::SQLite reasonably wants DBI at config time
-    HARD_DEPS="DBI $HARD_DEPS"
+    perl -MDBI -e1 &>/dev/null || HARD_DEPS="DBI $HARD_DEPS"
 
     # this is a fucked CPAN - won't understand configure_requires of
     # various pieces we may run into
@@ -197,8 +218,16 @@ while (@chunks) {
 else
 
   # listalldeps is deliberate - will upgrade everything it can find
-  parallel_installdeps_notest $(make listalldeps | grep -v List::Util)
+  # we exclude SQLA specifically, since we do not want to pull
+  # in 1.99_xx on bleadcpan runs
+  deplist="$(make listalldeps | grep -vP '^(SQL::Abstract)$')"
 
+  # assume MDV on POISON_ENV, do not touch DBI/SQLite
+  if [[ "$POISON_ENV" = "true" ]] ; then
+    deplist="$(grep -vP '^(DBI|DBD::SQLite)$' <<< "$deplist")"
+  fi
+
+  parallel_installdeps_notest "$deplist"
 fi
 
 echo_err "$(tstamp) Dependency installation finished"
@@ -215,6 +244,13 @@ if [[ -n "$(make listdeps)" ]] ; then
   exit 1
 fi
 
+# check that our MDV somewhat works
+if [[ "$POISON_ENV" = "true" ]] && ( perl -MDBD::SQLite\ 1.38 -e1 || perl -MDBI\ 1.615 -e1 ) &>/dev/null ; then
+  echo_err "Something went wrong - higher versions of DBI and/or DBD::SQLite than we expected"
+  exit 1
+fi
+
+
 # announce what are we running
 echo_err "
 ===================== DEPENDENCY CONFIGURATION COMPLETE =====================