X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=.travis.yml;h=b0708941b467644e80b82317ffa9d60d8b0668dd;hb=69016f65df5f30e446734b8cc94c216915c9105b;hp=cc065f1b676dc8411ef5cde7fb9a2391de2a89c6;hpb=afeb40d23677e897d27b843b8d976d7c8945e6ce;p=dbsrgits%2FDBIx-Class.git

diff --git a/.travis.yml b/.travis.yml
index cc065f1..b070894 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@
 #   possible set of deps *without testing them*. This ensures we stay within
 #   a reasonable build-time and still run as many of our tests as possible
 #
-# * The perl builds and the DBIC tests run under NUMTHREADS number of threads.
+# * The perl builds and the DBIC tests run under VCPU_USE number of threads.
 # The testing of dependencies under CLEANTEST runs single-threaded, at least
 # until we fix our entire dep-chain to safely pass under -j
 #
@@ -70,83 +70,94 @@ notifications:
 language: perl
 
 perl:
+  - "5.8"
   - "5.20-extras"
 
 env:
   - CLEANTEST=false
-  - CLEANTEST=true
+  - CLEANTEST=true VCPU_USE=1
+
+sudo: true
 
 matrix:
   fast_finish: true
   include:
-    # this particular perl is quite widespread
-    - perl: 5.8.8_thr_mb
+    # CLEANTEST of minimum supported with non-tracing poisoning
+    - perl: 5.8.3_nt_mb
       env:
         - CLEANTEST=true
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=5.8.8
+        - POISON_ENV=true
+        - DBIC_TRACE_PROFILE=console_monochrome
+        - BREWVER=5.8.3
+        - BREWOPTS="-Dusemorebits"
 
-    # so is this one (test a sane CPAN.pm)
-    - perl: 5.12.4_thr_mb
+    # Full Test of minimum supported without threads with non-tracing poisoning
+    - perl: 5.8.3_nt
       env:
-        - CLEANTEST=true
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=5.12.4
+        - CLEANTEST=false
+        - POISON_ENV=true
+        - BREWVER=5.8.3
 
-    # this is the perl suse ships
-    - perl: 5.10.0_thr_dbg
+    # Full Test of minimum supported with threads with non-tracing poisoning
+    - perl: 5.8.5_thr
+      env:
+        - CLEANTEST=false
+        - POISON_ENV=true
+        - DBIC_TRACE_PROFILE=console
+        - BREWVER=5.8.5
+        - BREWOPTS="-Duseithreads"
+
+    # CLEANTEST of solaris-like perl with non-tracing poisoning
+    - perl: 5.8.4_nt
       env:
         - CLEANTEST=true
-        - BREWOPTS="-DDEBUGGING -Duseithreads"
-        - BREWVER=5.10.0
+        - POISON_ENV=true
+        - DBIC_TRACE_PROFILE=console
+        - BREWVER=5.8.4
 
-    # CLEANTEST of minimum supported
-    - perl: 5.8.3_nt_mb
+    # CLEANTEST: this particular perl is quite widespread
+    - perl: 5.8.8_thr_mb
       env:
         - CLEANTEST=true
-        - BREWOPTS="-Dusemorebits"
-        - BREWVER=5.8.3
+        - BREWVER=5.8.8
+        - BREWOPTS="-Duseithreads -Dusemorebits"
 
-    # Full Test of minimum supported with threads
-    - perl: 5.8.5_thr
+    # CLEANTEST: this is the perl suse ships, with env poisoning
+    - perl: 5.10.0_thr_dbg
       env:
-        - CLEANTEST=false
-        - BREWOPTS="-Duseithreads"
-        - BREWVER=5.8.5
-        - DBIC_TRACE_PROFILE=console
+        - CLEANTEST=true
+        - POISON_ENV=true
+        - BREWVER=5.10.0
+        - BREWOPTS="-DDEBUGGING -Duseithreads"
 
-    # Full Test of minimum supported without threads
-    - perl: 5.8.3_nt
+    # CLEANTEST: this one is in a number of debian-based LTS (test a sane CPAN.pm)
+    - perl: 5.14.2_thr_mb
       env:
-        - CLEANTEST=false
-        - BREWOPTS=""
-        - BREWVER=5.8.3
-        - DBIC_TRACE_PROFILE=console_monochrome
+        - CLEANTEST=true
+        - BREWVER=5.14.2
+        - BREWOPTS="-Duseithreads -Dusemorebits"
 
     ###
     # some permutations of tracing and envvar poisoning
 
-    - perl: 5.16.3_thr_mb
+    - perl: 5.12.3_thr
       env:
-        - CLEANTEST=false
+        - CLEANTEST=true
         - POISON_ENV=true
         - DBIC_TRACE=1
-        - DBIC_MULTICREATE_DEBUG=0
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=5.16.3
-
-    - perl: 5.20-extras
-      env:
-        - CLEANTEST=false
-        - POISON_ENV=true
+        - DBIC_MULTICREATE_DEBUG=1
+        - DBIC_STORAGE_RETRY_DEBUG=1
         - DBIC_TRACE_PROFILE=console
+        - BREWVER=5.12.3
+        - BREWOPTS="-Duseithreads"
 
-    - perl: 5.8
+    - perl: 5.16.3_thr_mb
       env:
-        - CLEANTEST=true
+        - CLEANTEST=false
         - POISON_ENV=true
         - DBIC_TRACE=1
-        - DBIC_TRACE_PROFILE=console
+        - BREWVER=5.16.3
+        - BREWOPTS="-Duseithreads -Dusemorebits"
 
     - perl: 5.18-extras
       env:
@@ -154,68 +165,96 @@ matrix:
         - POISON_ENV=true
         - DBIC_TRACE=1
         - DBIC_TRACE_PROFILE=console_monochrome
-        - DBIC_MULTICREATE_DEBUG=0
+        - DBICTEST_VIA_REPLICATED=0
 
     ###
     # Start of the allow_failures block
 
-    # old threaded with blead CPAN
-    - perl: devcpan_5.8.7_thr
+    # threaded oldest possible with blead CPAN
+    - perl: devcpan_5.8.1_thr_mb
       env:
         - CLEANTEST=true
-        - BREWOPTS="-Duseithreads"
-        - BREWVER=5.8.7
         - DEVREL_DEPS=true
+        - BREWVER=5.8.1
+        - BREWOPTS="-Duseithreads -Dusemorebits"
 
-    # 5.10.0 threaded with blead CPAN
-    - perl: devcpan_5.10.0_thr_mb
+    # oldest possible with blead CPAN with poisoning
+    - perl: devcpan_5.8.1
       env:
         - CLEANTEST=true
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=5.10.0
         - DEVREL_DEPS=true
+        - POISON_ENV=true
+        - BREWVER=5.8.1
+
+    # 5.8.3 with blead CPAN
+    - perl: devcpan_5.8.3_mb
+      env:
+        - CLEANTEST=false
+        - DEVREL_DEPS=true
+        - BREWVER=5.8.3
+        - BREWOPTS="-Dusemorebits"
 
-    # 5.12.2 with blead CPAN
-    - perl: devcpan_5.12.2_thr
+    # 5.8.7 threaded with blead CPAN with non-tracing poisoning
+    - perl: devcpan_5.8.7_thr
       env:
         - CLEANTEST=true
-        - BREWOPTS="-Duseithreads"
-        - BREWVER=5.12.2
         - DEVREL_DEPS=true
+        - POISON_ENV=true
+        - BREWVER=5.8.7
+        - BREWOPTS="-Duseithreads"
 
-    # recentish threaded stable with blead CPAN
-    - perl: devcpan_5.18.2_thr_mb
+    # 5.10.0 threaded with blead CPAN
+    - perl: devcpan_5.10.0_thr_mb
       env:
-        - CLEANTEST=false
+        - CLEANTEST=true
+        - DEVREL_DEPS=true
+        - BREWVER=5.10.0
         - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=5.18.2
+
+    # 5.12.1 with blead CPAN
+    - perl: devcpan_5.12.1_thr
+      env:
+        - CLEANTEST=true
         - DEVREL_DEPS=true
+        - BREWVER=5.12.1
+        - BREWOPTS="-Duseithreads"
 
-    # bleadperl with stock CPAN, full depchain test
+    # bleadperl with stock CPAN, full depchain test with non-tracing poisoning
     - perl: bleadperl
       env:
         - CLEANTEST=true
+        - POISON_ENV=true
         - BREWVER=blead
 
     # bleadperl with blead CPAN
     - perl: devcpan_bleadperl_thr_mb
       env:
         - CLEANTEST=false
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=blead
         - DEVREL_DEPS=true
+        - BREWVER=blead
+        - BREWOPTS="-Duseithreads -Dusemorebits"
 
+    # CLEANTEST of http://schplog.schmorp.de/2015-06-06-a-stable-perl.html with non-tracing poisoning
+    - perl: schmorp_stableperl_thr_mb
+      env:
+        - CLEANTEST=true
+        - POISON_ENV=true
+        - BREWVER=schmorp_stableperl
+        - BREWOPTS="-Duseithreads -Dusemorebits"
 
   # which ones of the above can fail
   allow_failures:
 
     # these run with various dev snapshots - allowed to fail
+    - perl: devcpan_5.8.1_thr_mb
+    - perl: devcpan_5.8.1
+    - perl: devcpan_5.8.3_mb
     - perl: devcpan_5.8.7_thr
     - perl: devcpan_5.10.0_thr_mb
-    - perl: devcpan_5.12.2_thr
-    - perl: devcpan_5.18.2_thr_mb
+    - perl: devcpan_5.12.1_thr
     - perl: bleadperl
     - perl: devcpan_bleadperl_thr_mb
+    - perl: schmorp_stableperl_thr_mb
 
 
 ###
@@ -254,24 +293,32 @@ install:
 before_script:
   # Preinstall/install deps based on envvars/CLEANTEST
   #
-  - maint/travis-ci_scripts/30_before_script.bash
+  # need to invoke the after_failure script manually
+  # because 'after_failure' runs only after 'script' fails
+  #
+  - maint/getstatus maint/travis-ci_scripts/30_before_script.bash || ( maint/travis-ci_scripts/50_after_failure.bash && /bin/false )
 
 script:
   # Run actual tests
   #
-  - maint/travis-ci_scripts/40_script.bash
+  - maint/getstatus maint/travis-ci_scripts/40_script.bash
+
+###
+### Set -e back, work around https://github.com/travis-ci/travis-ci/issues/3533
+###
+  - set -e
 
 after_success:
   # Check if we can assemble a dist properly if not in CLEANTEST
   #
-  - maint/travis-ci_scripts/50_after_success.bash
+  - maint/getstatus maint/travis-ci_scripts/50_after_success.bash
 
 after_failure:
-  # No tasks yet
+  # Final sysinfo printout on fail
   #
-  #- maint/travis-ci_scripts/50_after_failure.bash
+  - maint/getstatus maint/travis-ci_scripts/50_after_failure.bash
 
 after_script:
   # No tasks yet
   #
-  #- maint/travis-ci_scripts/60_after_script.bash
+  #- maint/getstatus maint/travis-ci_scripts/60_after_script.bash