From: Peter Rabbitson <ribasushi@cpan.org>
Date: Mon, 14 Oct 2013 08:07:28 +0000 (+0200)
Subject: Really work around https://github.com/travis-ci/travis-ci/issues/1477
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8cddfc1b17054d234b454f7b454a906360299bdb;p=dbsrgits%2FDBIx-Class-Historic.git

Really work around https://github.com/travis-ci/travis-ci/issues/1477

Just upgrade cpanm by hand with --dev
---

diff --git a/maint/travis-ci_scripts/20_install.bash b/maint/travis-ci_scripts/20_install.bash
index c8bd62a..4118dfc 100755
--- a/maint/travis-ci_scripts/20_install.bash
+++ b/maint/travis-ci_scripts/20_install.bash
@@ -24,8 +24,10 @@ if [[ "$DEVREL_DEPS" == "true" ]] ; then
 
   PERL_CPANM_OPT="$PERL_CPANM_OPT --dev"
 
-  # FIXME work around https://github.com/miyagawa/cpanminus/issues/308
-  TEST_BUILDER_BETA_CPAN_TARBALL="M/MS/MSCHWERN/Test-Simple-1.005000_006.tar.gz"
+  # FIXME inline-upgrade cpanm, work around https://github.com/travis-ci/travis-ci/issues/1477
+  cpanm_loc="$(which cpanm)"
+  run_or_err "Upgrading cpanm ($cpanm_loc) to latest stable" \
+    "wget -q -O $cpanm_loc cpanmin.us && chmod a+x $cpanm_loc"
 fi
 
 # Fixup CPANM_OPT to behave more like a traditional cpan client
diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index 46eef91..f4580af 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -158,12 +158,10 @@ while (@chunks) {
   fi
 
 else
-  if [[ -n "$TEST_BUILDER_BETA_CPAN_TARBALL" ]] ; then
-    parallel_installdeps_notest $TEST_BUILDER_BETA_CPAN_TARBALL
-  fi
 
   # listalldeps is deliberate - will upgrade everything it can find
   parallel_installdeps_notest $(make listalldeps)
+
 fi
 
 echo_err "$(tstamp) Dependency installation finished"