X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F30_before_script.bash;h=93fe1cff9f9e5c3fff31169da360b5f2a4e4d0ea;hb=fe5a6296f7555301560e3e2717cec4ab6831089a;hp=689c9ca6bb56207b535422996d63475314a1b397;hpb=464bbc0a452a828139ac03859b2d777525b8bfea;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index 689c9ca..93fe1cf 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -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,7 +110,7 @@ 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::Name MRO::Compat Class::XSAccessor URI::Escape HTML::Entities
+  parallel_installdeps_notest Test::Pod::Coverage Test::EOL 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
@@ -229,9 +229,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
@@ -239,10 +239,6 @@ else
   fi
 
   parallel_installdeps_notest "$deplist"
-
-  # Temporary workaround: install DBIC devrel,
-  # Storage::DBI::ODBC::Firebird is broken in stable
-  run_or_err 'Installing DBIx::Class 0.082700_05' 'cpanm --notest DBIx::Class@0.082700_05'
 fi
 
 echo_err "$(tstamp) Dependency installation finished"