From: Dagfinn Ilmari Mannsåker Date: Tue, 20 Mar 2018 22:52:35 +0000 (+0000) Subject: Stop avoiding DBIx::Class dev releases on Travis X-Git-Tag: v0.07049~4 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c72b56fb290c654022e1a0ebdff2d57484f49959;p=dbsrgits%2FDBIx-Class-Schema-Loader.git Stop avoiding DBIx::Class dev releases on Travis The Data::Query ones that used to break us are long obsolete, and the filtering was failing to install DBIC at all neither if CLEANTEST nor DEVREL_DEPS were true. --- diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index c6b5261..34b86bb 100755 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -66,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 DBIC 0.089xx, do not consider it - # - installdeps 'DBIx::Class~<0.08900' - - 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 @@ -213,9 +208,7 @@ while (@chunks) { else # listalldeps is deliberate - will upgrade everything it can find - # we exclude DBIC specifically, since we do not want to pull - # in 0.089xx on bleadcpan runs - deplist="$(listalldeps | grep -vP '^(DBIx::Class)$')" + deplist="$(listalldeps)" # assume MDV on POISON_ENV, do not touch DBI/SQLite if [[ "$POISON_ENV" = "true" ]] ; then