From: Peter Rabbitson Date: Fri, 10 Jun 2016 06:13:30 +0000 (+0200) Subject: (travis) Revert parts of e66f0ee0 and ee3a37d3 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c2fb4a8c6dab173c717e9decc48df4efef6a5abf;p=dbsrgits%2FDBIx-Class.git (travis) Revert parts of e66f0ee0 and ee3a37d3 The typing of @array * $int got relaxed, and it turns out c5.22.2 worked just fine *without* distroprefs, so I never noticed them being ignored --- diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index 10932d3..2a55324 100755 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -24,13 +24,8 @@ if is_cperl ; then export PERL5LIB="$PERL5LIB:." # Also need to have YAML in place, otherwise the distroprefs are not readable - # (cperl 5.22.2 comes with YAML already) - perl -M5.022002 -e1 &>/dev/null || installdeps YAML - - # Work around cperl's Test::More being typed, by getting the CPAN one - # https://github.com/perl11/cperl/issues/153#issuecomment-224515895 - # ( in the long term this is sadly a nail in cperl's coffin :/ ) - installdeps Test::More + # work around https://github.com/perl11/cperl/issues/155#issuecomment-224862978 + perl -MYAML -e1 &>/dev/null || installdeps YAML fi