From: Peter Rabbitson <ribasushi@cpan.org>
Date: Mon, 8 Aug 2016 18:49:39 +0000 (+0200)
Subject: (travis) Work around RT#116788
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b4532c43fcddd43dba8b0fc58022ed6f48f80351;p=dbsrgits%2FDBIx-Class.git

(travis) Work around RT#116788
---

diff --git a/maint/travis-ci_scripts/50_after_success.bash b/maint/travis-ci_scripts/50_after_success.bash
index 8b44371..41b2fd1 100755
--- a/maint/travis-ci_scripts/50_after_success.bash
+++ b/maint/travis-ci_scripts/50_after_success.bash
@@ -27,6 +27,12 @@ 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)
 
@@ -34,6 +40,13 @@ if [[ "$DEVREL_DEPS" == "true" ]] && perl -M5.008003 -e1 &>/dev/null ; then
   tarball_assembled=1
 
 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"