Update Firebird ODBC driver version

[dbsrgits/DBIx-Class-Schema-Loader.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 365eca0..c25e966 100755 (executable)
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -3,7 +3,7 @@
 # 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 return ; fi
+if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then exit 0 ; fi
 
 # poison the environment
 if [[ "$POISON_ENV" = "true" ]] ; then
@@ -79,9 +79,9 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # handholding
 
   if [[ "$DEVREL_DEPS" == "true" ]] ; then
-    # We are not "quite ready" for SQLA 1.99, do not consider it
+    # We are not "quite ready" for DBIC 0.089xx, do not consider it
     #
-    installdeps 'SQL::Abstract~<1.99'
+    installdeps 'DBIx::Class~<0.08900'
 
   elif ! CPAN_is_sane ; then
     # no configure_requires - we will need the usual suspects anyway
@@ -110,11 +110,11 @@ else
   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::Util MRO::Compat Class::XSAccessor URI::Escape HTML::Entities
+  parallel_installdeps_notest Test::Pod::Coverage Test::EOL Test::NoTabs Test::Strict Devel::GlobalDestruction Sub::Util 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 SQL::Abstract Moose Module::Install JSON SQL::Translator File::Which
-  parallel_installdeps_notest Module::Install::ReadmeFromPod
-  parallel_installdeps_notest Math::Base36 DBD::mysql DBD::Pg Math::BigInt
+  parallel_installdeps_notest Module::Install::ReadmeFromPod Module::Install::AuthorTests
+  parallel_installdeps_notest Math::Base36 DBD::mysql DBD::Pg Math::BigInt String::CamelCase
   parallel_installdeps_notest MooseX::NonMoose MooseX::MarkAsMethods namespace::autoclean
 
   if env | grep -q '^DBICTEST_.*_ODBC_DSN'; then
@@ -166,10 +166,6 @@ if [[ "$CLEANTEST" = "true" ]]; then
     # FIXME - need to get these off metacpan or something instead
     HARD_DEPS="ExtUtils::Depends B::Hooks::OP::Check $HARD_DEPS"
 
-    # FIXME
-    # parent is temporary due to Carp https://rt.cpan.org/Ticket/Display.html?id=88494
-    HARD_DEPS="parent $HARD_DEPS"
-
     if CPAN_supports_BUILDPL ; then
       # We will invoke a posibly MBT based BUILD-file, but we do not support
       # configure requires. So we not only need to install MBT but its prereqs
@@ -229,9 +225,9 @@ while (@chunks) {
 else
 
   # listalldeps is deliberate - will upgrade everything it can find
-  # 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)$')"
+  # we exclude DBIC specifically, since we do not want to pull
+  # in 0.089xx on bleadcpan runs
+  deplist="$(make listalldeps | grep -vP '^(DBIx::Class)$')"
 
   # assume MDV on POISON_ENV, do not touch DBI/SQLite
   if [[ "$POISON_ENV" = "true" ]] ; then