X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=.travis.yml;h=d48e50ac67b25fb1f9ad6d28355cc40f6e5bcecf;hp=6d24afa9750a5c1b2c4a87f7cd6f66bc8307e854;hb=5cff3cab4ea061782df47c99e14ff30b61ee1aac;hpb=dc63d4cf338565ef93f25d52202f84d2ca3da932

diff --git a/.travis.yml b/.travis.yml
index 6d24afa..d48e50a 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
 
@@ -41,6 +36,9 @@ script:
    #  (note: currently skipping DBIC deps for speed)
    - make install
 
+   - export AUTHOR_TESTING=0
+   - export RELEASE_TESTING=0
+
    # pure author deps (of reverse deps):
    - cpanm --notest --metacpan --skip-satisfied YAML::Syck