oops, more squash

[p5sagit/Sub-Name.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index c55b75c..a063a52 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,15 +32,15 @@ perl:
   - "5.8-thr"
   - "5.6.2"
   - "5.6.2-thr"
+matrix:
+  allow_failures:
+    - perl: blead
+    - perl: blead-thr
 env:
   global:
     - AUTHOR_TESTING=1
     - AUTOMATED_TESTING=1
     - RELEASE_TESTING=0
-matrix:
-  allow_failures:
-    - perl: blead
-    - perl: blead-thr
 before_install:
   - git clone git://github.com/travis-perl/helpers ~/travis-perl-helpers
   - source ~/travis-perl-helpers/init
@@ -49,10 +49,9 @@ before_install:
   - build-dist
   - cd $BUILD_DIR
 install:
-  - cpan-install ExtUtils::MakeMaker~6.68 Devel::PPPort~3.33
+  - perl -M5.014 -e1 2>/dev/null || cpan-install Dist::Zilla@5.047
+  - cpan-install --deps
 script:
   - perl Makefile.PL
   - make
   - prove -b -r -s -j$(test-jobs) $(test-files)
-before_install:
-  - if [ "$TRAVIS_PERL_VERSION" = "5.6.2" ]; then eval $(curl https://travis-perl.github.io/init) --auto; fi