X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=.travis.yml;h=711ff52461d8c9e78adaef136b8f89f68e54b969;hb=1efe7373bf0ef978f6199c6f490f6f01de73ec48;hp=e0580f522cb95eb316fd79193cdc3ad921731077;hpb=2afb2c497d410ce3a32a23851ad7b720c2b4feaf;p=catagits%2FCatalyst-Runtime.git

diff --git a/.travis.yml b/.travis.yml
index e0580f5..711ff52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,25 +12,20 @@ perl:
    - "5.10"
    - "5.8"
 
+before_install:
+   - eval $(curl https://travis-perl.github.io/init)
+   - $HELPERS_ROOT/bin/cpan-config
 install:
    - cpanm --notest --metacpan --skip-satisfied --with-develop --installdeps .
    - perl Makefile.PL
 
-   # installing Catalyst::Devel above causes the latest release of
-   # Catalyst::Runtime to be installed, but the version we're testing might
-   # have additional deps that aren't yet satisfied. so we should try
-   # installing deps again now that the MYMETA has been created (and we'll also
-   # need to delete the now-unneeded cpanfile so that cpanm doesn't choose it
-   # in preference to the MYMETA)
-   - rm -f cpanfile
-   - cpanm --notest --metacpan --skip-satisfied --installdeps .
-
    # enable various test options, including parallel testing
    - export AUTOMATED_TESTING=1 HARNESS_OPTIONS=j10:c HARNESS_TIMER=1
 
    # we want these for our tests, but not for any others
    - export AUTHOR_TESTING=1
    - export RELEASE_TESTING=1
+   - export PERL_AUTOINSTALL=--skip
 
    - make manifest
 
@@ -49,15 +44,15 @@ script:
    - cpanm --metacpan --skip-satisfied Catalyst::Plugin::Authentication
 
    # pure reverse deps (call with --test-only):
-   - cpanm --test-only --metacpan Catalyst::Devel
-   - cpanm --test-only --metacpan Catalyst::Action::REST
-   - cpanm --test-only --metacpan Catalyst::Component::InstancePerContext
-   - cpanm --test-only --metacpan Catalyst::Plugin::Session
-   - cpanm --test-only --metacpan Catalyst::Plugin::Session::State::Cookie
-   - cpanm --test-only --verbose --metacpan Catalyst::Plugin::Static::Simple
-   - cpanm --test-only --metacpan Catalyst::Plugin::ConfigLoader
-   - cpanm --test-only --metacpan Catalyst::Plugin::ConfigLoader
-   - cpanm --test-only --verbose --metacpan Catalyst::Authentication::Credential::HTTP
+   - cpanm --test-only --metacpan -v Catalyst::Devel
+   - cpanm --test-only --metacpan -v Catalyst::Action::REST
+   - cpanm --test-only --metacpan -v Catalyst::Component::InstancePerContext
+   - cpanm --test-only --metacpan -v Catalyst::Plugin::Session
+   - cpanm --test-only --metacpan -v Catalyst::Plugin::Session::State::Cookie
+   - cpanm --test-only --metacpan -v Catalyst::Plugin::Static::Simple
+   - cpanm --test-only --metacpan -v Catalyst::Plugin::ConfigLoader
+   - cpanm --test-only --metacpan -v Catalyst::Plugin::ConfigLoader
+   #- cpanm --test-only --verbose --metacpan Catalyst::Authentication::Credential::HTTP
 
    # Still need to figure out why these fail in travis:
    #- cpanm --test-only --metacpan -v Catalyst::View::Email