Nick Travis script improvements from DBIC

[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 1a8c53b..99cebe6 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
@@ -93,6 +95,9 @@ else
   # using SQLT and set up whatever databases necessary
   export DBICTEST_SQLT_DEPLOY=1
 
+  # Include Moose-using tests
+  export SCHEMA_LOADER_TESTS_USE_MOOSE=1
+
   # do the preinstall in several passes to minimize amount of cross-deps installing
   # multiple times, and to avoid module re-architecture breaking another install
   # (e.g. once Carp is upgraded there's no more Carp::Heavy,
@@ -109,7 +114,8 @@ else
   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
+  parallel_installdeps_notest DBD::ODBC DBD::Firebird DBD::Oracle Math::Base36 DBD::mysql DBD::Pg Math::BigInt
+  parallel_installdeps_notest MooseX::NonMoose MooseX::MarkAsMethods namespace::autoclean
 
   if [[ -n "$DBICTEST_FIREBIRD_INTERBASE_DSN" ]] ; then
     # the official version is very much outdated and does not compile on 5.14+
@@ -220,6 +226,10 @@ 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"
@@ -248,24 +258,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)"