From: Peter Rabbitson Date: Thu, 17 Jul 2014 13:12:52 +0000 (+0200) Subject: (travis) T::B 1.005 is superseded by 1.300 - remove handholding X-Git-Tag: v0.082800~138 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=082f208f38cdd955fb034e0cac4929478e51a21d;p=dbsrgits%2FDBIx-Class.git (travis) T::B 1.005 is superseded by 1.300 - remove handholding --- diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index e6c2ab5..26fca7a 100755 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -77,15 +77,9 @@ if [[ "$CLEANTEST" = "true" ]]; then # handholding if [[ "$DEVREL_DEPS" == "true" ]] ; then - # Many dists still do not pass tests under tb1.5 properly (and it itself - # does not even install on things like 5.10). Install the *stable-dev* - # latest T::B here, so that it will not show up as a dependency, and - # hence it will not get installed a second time as an unsatisfied dep - # under cpanm --dev + # We are not "quite ready" for SQLA 1.99, do not consider it # - # We are also not "quite ready" for SQLA 1.99, do not consider it - # - installdeps 'Test::Builder~<1.005' 'SQL::Abstract~<1.99' + installdeps 'SQL::Abstract~<1.99' elif ! CPAN_is_sane ; then # no configure_requires - we will need the usual suspects anyway @@ -99,13 +93,6 @@ else # using SQLT and set up whatever databases necessary export DBICTEST_SQLT_DEPLOY=1 - # FIXME - need new TB1.5 devrel - # if we run under --dev install latest github of TB1.5 first - # (unreleased workaround for precedence warnings) - if [[ "$DEVREL_DEPS" == "true" ]] ; then - parallel_installdeps_notest git://github.com/nthykier/test-more.git@fix-return-precedence-issue - fi - # 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,