Revert "Install DBIC dev rel under CLEANTEST="false""

[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 2029e90..365eca0 100755 (executable)
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -1,6 +1,8 @@
 #!/bin/bash
 
+# 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
 
 # poison the environment
@@ -108,13 +110,26 @@ 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
-  parallel_installdeps_notest DBD::ODBC DBD::Firebird DBD::Oracle Math::Base36 DBD::mysql DBD::Pg Math::BigInt
+  parallel_installdeps_notest Math::Base36 DBD::mysql DBD::Pg Math::BigInt
   parallel_installdeps_notest MooseX::NonMoose MooseX::MarkAsMethods namespace::autoclean
 
+  if env | grep -q '^DBICTEST_.*_ODBC_DSN'; then
+    parallel_installdeps_notest DBD::ODBC
+  fi
+  if [[ -n "$DBICTEST_ORA_DSN" ]]; then
+    parallel_installdeps_notest DBD::Oracle
+  fi
+  if [[ -n "$DBICTEST_DB2_DSN" ]]; then
+    parallel_installdeps_notest DBD::DB2
+  fi
+  if [[ -n "$DBICTEST_FIREBIRD_DSN" ]]; then
+    parallel_installdeps_notest DBD::Firebird
+  fi
+
   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):
@@ -224,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"
@@ -256,24 +267,4 @@ echo_err "
 ===================== DEPENDENCY CONFIGURATION COMPLETE =====================
 $(tstamp) Configuration phase seems to have taken $(date -ud "@$SECONDS" '+%H:%M:%S') (@$SECONDS)
 
-= CPUinfo
-$(perl -0777 -p -e 's/.+\n\n(?!\z)//s' < /proc/cpuinfo)
-
-= Meminfo
-$(free -m -t)
-
-= Kernel info
-$(uname -a)
-
-= Network Configuration
-$(ip addr)
-
-= Network Sockets Status
-$(sudo netstat -an46p | grep -Pv '\s(CLOSING|(FIN|TIME|CLOSE)_WAIT.?|LAST_ACK)\s')
-
-= Environment
-$(env | grep -P 'TEST|HARNESS|MAKE|TRAVIS|PERL|DBIC' | LC_ALL=C sort | cat -v)
-
-= Perl in use
-$(perl -V)
-============================================================================="
+$(ci_vm_state_text)"