Use more env vars in Travis config

metacpan · Jun 8, 2017 · 881cd14 · 881cd14
1 parent 2f61f34
commit 881cd14
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,20 +6,22 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: COVERAGE=1 USE_CPANFILE_SNAPSHOT=true
-    - env: USE_CPANFILE_SNAPSHOT=false PERL_CARTON_PATH=$TRAVIS_BUILD_DIR/no-snapshot HARNESS_VERBOSE=1
+    - env: USE_CPANFILE_SNAPSHOT=false CPAN_RESOLVER=metadb PERL_CARTON_PATH=$TRAVIS_BUILD_DIR/no-snapshot HARNESS_VERBOSE=1
 env:
   global:
     # Carton --deployment only works on the same version of perl
     # that the snapshot was built from.
     - DEPLOYMENT_PERL_VERSION=5.22
     - DEVEL_COVER_OPTIONS="-ignore,^local/"
+    - PERL_CARTON_PATH=$TRAVIS_BUILD_DIR/local
+    - CPAN_RESOLVER=snapshot
   matrix:
 
     # Get one passing run with coverage and one passing run with Test::Vars
     # checks.  If run together they more than double the build time.
-    - COVERAGE=1 USE_CPANFILE_SNAPSHOT=true
-    - USE_CPANFILE_SNAPSHOT=false PERL_CARTON_PATH=$TRAVIS_BUILD_DIR/no-snapshot HARNESS_VERBOSE=1
+    - USE_CPANFILE_SNAPSHOT=false CPAN_RESOLVER=metadb PERL_CARTON_PATH=$TRAVIS_BUILD_DIR/no-snapshot HARNESS_VERBOSE=1
     - USE_CPANFILE_SNAPSHOT=true
+    - USE_CPANFILE_SNAPSHOT=true COVERAGE=1
 
 before_install:
   - git clone git://github.com/travis-perl/helpers ~/travis-perl-helpers
@@ -32,7 +34,7 @@ before_install:
 
 install:
   - cpan-install --coverage   # installs converage prereqs, if enabled
-  - 'cpm install `test "${USE_CPANFILE_SNAPSHOT}" = "false" && echo " -L $TRAVIS_BUILD_DIR/no-snapshot --resolver metadb" || echo " --resolver snapshot"`'
+  - cpm install -L $PERL_CARTON_PATH --resolver $CPAN_RESOLVER
   - find $TRAVIS_BUILD_DIR/no-snapshot | grep pm
 
 before_script: