From: Peter Rabbitson Date: Tue, 16 Aug 2016 09:56:08 +0000 (+0200) Subject: (travis) Revert 81cf62797 and b4532c43f (both fixed since) X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=28f9d99c8707970d77b3a98bdc4eda9bb35d193f;p=dbsrgits%2FDBIx-Class.git (travis) Revert 81cf62797 and b4532c43f (both fixed since) --- diff --git a/.travis.yml b/.travis.yml index 719a83a..8ba45b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -363,10 +363,6 @@ matrix: # which ones of the above can fail allow_failures: - # FIXME work around https://github.com/travis-ci/travis-ci/issues/6439 - - perl: 5.18-extras - - perl: 5.24.0_thr_qm - # these run with various dev snapshots - allowed to fail - perl: cperl-5.24.0_thr_qm - perl: cperl-master_thr diff --git a/maint/travis-ci_scripts/50_after_success.bash b/maint/travis-ci_scripts/50_after_success.bash index 41b2fd1..83f1a89 100644 --- a/maint/travis-ci_scripts/50_after_success.bash +++ b/maint/travis-ci_scripts/50_after_success.bash @@ -27,12 +27,6 @@ if [[ "$DEVREL_DEPS" == "true" ]] && perl -M5.008003 -e1 &>/dev/null ; then parallel_installdeps_notest YAML Lexical::SealRequireHints fi - # FIXME - workaround for RT#116788 - # ( two instances, see below ) - if ! perl -M5.008007 -e1 &>/dev/null; then - parallel_installdeps_notest 'Encode~!=2.85' - fi - # FIXME Change when Moose goes away installdeps Moose $(perl -Ilib -MDBIx::Class::Optional::Dependencies=-list_missing,dist_dir) @@ -41,12 +35,6 @@ if [[ "$DEVREL_DEPS" == "true" ]] && perl -M5.008003 -e1 &>/dev/null ; then elif [[ "$CLEANTEST" != "true" ]] ; then - # FIXME - workaround for RT#116788 - # ( two instances, see above ) - if ! perl -M5.008007 -e1 &>/dev/null; then - parallel_installdeps_notest 'Encode~!=2.85' - fi - parallel_installdeps_notest $(perl -Ilib -MDBIx::Class::Optional::Dependencies=-list_missing,dist_dir) run_or_err "Attempt to build a dist from original checkout" "make dist"