Switch the main dev branch back to 'master'

[dbsrgits/DBIx-Class.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 6fabbd0..4b3fb43 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,10 +14,6 @@
 
 #
 # Smoke all branches except for blocked* and wip/*
-#
-# Additionally master does not smoke with bleadperl
-# ( implemented in maint/travis-ci_scripts/10_before_install.bash )
-#
 branches:
   except:
     - /^wip\//
@@ -139,12 +135,13 @@ matrix:
         - DBIC_TRACE_PROFILE=console
         - BREWVER=5.8.4
 
-    # CLEANTEST: this particular perl is quite widespread
+    # Full test: this particular perl is quite widespread, single thread
     - perl: "5.8.8_thr"
-      sudo: false
+      sudo: required
       dist: precise
       env:
-        - CLEANTEST=true
+        - VCPU_USE=1
+        - CLEANTEST=false
         - BREWVER=5.8.8
         - BREWOPTS="-Duseithreads"
 
@@ -294,11 +291,12 @@ matrix:
         - POISON_ENV=true
         - BREWVER=blead
 
-    # bleadperl with blead CPAN
+    # bleadperl with blead CPAN, single thread
     - perl: "devcpan_bleadperl_thr_mb"
       sudo: required
       # explicitly do not specify dist - see what the default does
       env:
+        - VCPU_USE=1
         - CLEANTEST=false
         - DEVREL_DEPS=true
         - BREWVER=blead