X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F30_before_script.bash;h=ca08b37ec8bb49ea338eca564ec7702544a5fa77;hb=8e29a48875aa1ba453041e2e52c428ef9a8c23cb;hp=365eca04d1286f88a4be1c1c0f2a1d86ab0183e5;hpb=1976f22dd6d925d2648f6f7169e39254777d536c;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 365eca0..ca08b37 100755
--- 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
@@ -58,18 +58,6 @@ if [[ "$POISON_ENV" = "true" ]] ; then
 fi
 
 if [[ "$CLEANTEST" = "true" ]]; then
-  # get the last inc/ off cpan - we will get rid of MI
-  # soon enough, but till then this will do
-  # the point is to have a *really* clean perl (the ones
-  # we build are guaranteed to be clean, without side
-  # effects from travis preinstalls)
-
-  # trick cpanm into executing true as shell - we just need the find+unpack
-  [[ -d ~/.cpanm/latest-build/DBIx-Class-*/inc ]] || run_or_err "Downloading latest stable DBIC inc/ from CPAN" \
-    "SHELL=/bin/true cpanm --look DBIx::Class::Schema::Loader"
-
-  mv ~/.cpanm/latest-build/DBIx-Class-Schema-Loader-*/inc .
-
   # The first CPAN which is somewhat sane is around 1.94_56 (perl 5.12)
   # The problem is that the first sane version also brings a *lot* of
   # deps with it, notably things like YAML and HTTP::Tiny
@@ -78,12 +66,7 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # So instead we still use our stock (possibly old) CPAN, and add some
   # handholding
 
-  if [[ "$DEVREL_DEPS" == "true" ]] ; then
-    # We are not "quite ready" for SQLA 1.99, do not consider it
-    #
-    installdeps 'SQL::Abstract~<1.99'
-
-  elif ! CPAN_is_sane ; then
+  if ! 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
@@ -110,12 +93,12 @@ 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 Module::Install::ReadmeFromPod Module::Install::AuthorTests
   parallel_installdeps_notest Math::Base36 DBD::mysql DBD::Pg Math::BigInt
-  parallel_installdeps_notest MooseX::NonMoose MooseX::MarkAsMethods namespace::autoclean
+  parallel_installdeps_notest MooseX::NonMoose MooseX::MarkAsMethods namespace::autoclean curry
 
   if env | grep -q '^DBICTEST_.*_ODBC_DSN'; then
     parallel_installdeps_notest DBD::ODBC
@@ -139,14 +122,14 @@ else
 
 fi
 
-# generate the makefile which will have different deps depending on
+# generate the MYMETA which will have different deps depending on
 # the runmode and envvars set above
 run_or_err "Configure on current branch" "perl Makefile.PL"
 
 # install (remaining) dependencies, sometimes with a gentle push
 if [[ "$CLEANTEST" = "true" ]]; then
   # we may need to prepend some stuff to that list
-  HARD_DEPS="$(echo $(make listdeps))"
+  HARD_DEPS="$(extract_prereqs .)"
 
 ##### TEMPORARY WORKAROUNDS needed in case we will be using CPAN.pm
   if [[ "$DEVREL_DEPS" != "true" ]] && ! CPAN_is_sane ; then
@@ -166,10 +149,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 +208,7 @@ 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)$')"
+  deplist="$(listalldeps)"
 
   # assume MDV on POISON_ENV, do not touch DBI/SQLite
   if [[ "$POISON_ENV" = "true" ]] ; then
@@ -246,12 +223,12 @@ echo_err "$(tstamp) Dependency installation finished"
 perl Makefile.PL
 
 # make sure we got everything we need
-if [[ -n "$(make listdeps)" ]] ; then
+if [[ -n "$(extract_prereqs .)" ]] ; then
   echo_err "$(tstamp) Not all deps installed - something went wrong :("
   sleep 1 # without this the echo below confuses the console listener >.<
   CPAN_is_sane || echo_err -e "Outdated CPAN.pm used - full installdep log follows\n$INSTALLDEPS_OUT\n\nSearch for 'NOT OK' in the text above\n\nDeps still missing:"
   sleep 3 # without this the above echo confuses the console listener >.<
-  make listdeps
+  extract_prereqs .
   exit 1
 fi