X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F30_before_script.bash;h=1de6cfb65d047bcb47f0a93b8557d61da903fcb2;hb=89d5e36fd191c1e303f91f15cd8c7c3d55fe6715;hp=71bf1623c3f7582eba5e9a1863dd8355519277de;hpb=e66f0ee02df23037e2b0f26bc6ae26a758e5c419;p=dbsrgits%2FDBIx-Class.git diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash old mode 100755 new mode 100644 index 71bf162..1de6cfb --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -24,8 +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 https://github.com/perl11/cperl/issues/155#issuecomment-224862978 + perl -MYAML -e1 &>/dev/null || installdeps YAML fi @@ -141,9 +141,16 @@ else parallel_installdeps_notest Test::Exception Encode::Locale Test::Fatal Module::Runtime parallel_installdeps_notest Test::Warn B::Hooks::EndOfScope Test::Differences HTTP::Status parallel_installdeps_notest Test::Pod::Coverage Test::EOL Devel::GlobalDestruction Sub::Name MRO::Compat Class::XSAccessor URI::Escape HTML::Entities - parallel_installdeps_notest YAML LWP Class::Trigger DateTime::Format::Builder Class::Accessor::Grouped Package::Variant + parallel_installdeps_notest YAML LWP Class::Trigger Class::Accessor::Grouped Package::Variant parallel_installdeps_notest SQL::Abstract Moose Module::Install@1.15 JSON SQL::Translator File::Which Class::DBI::Plugin git://github.com/dbsrgits/perl-pperl.git + # FIXME - temp workaround for RT#117959 + if ! perl -M5.008004 -e1 &>/dev/null ; then + parallel_installdeps_notest DateTime::Locale@1.06 + parallel_installdeps_notest DateTime::TimeZone@2.02 + parallel_installdeps_notest DateTime@1.38 + fi + # the official version is very much outdated and does not compile on 5.14+ # use this rather updated source tree (needs to go to PAUSE): # https://github.com/pilcrow/perl-dbd-interbase @@ -185,6 +192,11 @@ if [[ "$CLEANTEST" = "true" ]]; then ##### END TEMPORARY WORKAROUNDS fi + # FIXME - work around RT#117844 + if [[ "$BREWVER" == "5.10.0" ]]; then + unset PERL_UNICODE + fi + installdeps $HARD_DEPS run_or_err "Re-configure" "perl Makefile.PL"