(travis) Remove makefile fixup, now hardcoded in the subrepo

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

diff --git a/.travis.yml b/.travis.yml
index 0260450..173bdb2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,23 +70,28 @@ matrix:
     # In genereal it is strongly recommended to keep things on the older
     # version indefinitely - there is little value in-depth smoking on
     # more recent software stacks
+    # Add moderate (not complete) poisoning, as these will run on PR-related
+    # builds, therefore contributors will get notified about *most* issues
     - perl: "5.8"
       sudo: required
       dist: precise
       env:
         - CLEANTEST=false
+        - POISON_ENV=true
 
     - perl: "5.10"
       sudo: required
       dist: precise
       env:
         - CLEANTEST=false
+        - POISON_ENV=true
 
     - perl: "5.22-extras"
       sudo: required
       dist: precise
       env:
         - CLEANTEST=false
+        - POISON_ENV=true
 
     # CLEANTEST of minimum supported with non-tracing poisoning, single thread (hence the sudo)
     - perl: "5.8.3_nt_mb"
@@ -204,7 +209,10 @@ matrix:
         - DBICTEST_VIA_REPLICATED=0
         - DBICTEST_VERSION_WARNS_INDISCRIMINATELY=1
 
-    - perl: "5.22.1_thr_qm"
+    # MAKE SURE TO KEEP THE FLAGS IDENTICAL TO CPERL BELOW
+    # allows for easier side-by-side comparison
+    # vcpu=1 for even more stable results
+    - perl: "5.24.0_thr_qm"
       # explicit new infra spec preparing for a future forced upgrade
       # also need to pull in a sufficiently new compiler for quadmath.h
       sudo: required
@@ -214,12 +222,38 @@ matrix:
         - CLEANTEST=true
         - POISON_ENV=true
         - MVDT=false
-        - BREWVER=5.22.1
+        - BREWVER=5.24.0
         - BREWOPTS="-Duseithreads -Dusequadmath"
 
     ###
     # Start of the allow_failures block
 
+    # MAKE SURE TO KEEP THE FLAGS IDENTICAL TO STOCK 5.latest.comparable ABOVE
+    # allows for easier side-by-side comparison
+    # vcpu=1 for even more stable results
+    - perl: "cperl-5.24.0_thr_qm"
+      # explicit new infra spec preparing for a future forced upgrade
+      # also need to pull in a sufficiently new compiler for quadmath.h
+      sudo: required
+      dist: trusty
+      env:
+        - VCPU_USE=1
+        - CLEANTEST=true
+        - POISON_ENV=true
+        - MVDT=false
+        - BREWVER=cperl-5.24.0
+        - BREWOPTS="-Duseithreads -Dusequadmath"
+
+    - perl: "cperl-master_thr"
+      sudo: false
+      dist: precise
+      env:
+        - CLEANTEST=true
+        - POISON_ENV=true
+        - MVDT=false
+        - BREWVER=cperl-master
+        - BREWOPTS="-Duseithreads -Dusedevel"
+
     # threaded oldest possible with blead CPAN
     - perl: "devcpan_5.8.1_thr_mb"
       sudo: false
@@ -330,6 +364,8 @@ matrix:
   allow_failures:
 
     # these run with various dev snapshots - allowed to fail
+    - perl: cperl-5.24.0_thr_qm
+    - perl: cperl-master_thr
     - perl: devcpan_5.8.1_thr_mb
     - perl: devcpan_5.8.1
     - perl: devcpan_5.8.3_mb
@@ -396,7 +432,7 @@ script:
 after_success:
   # Check if we can assemble a dist properly if not in CLEANTEST
   #
-  - maint/getstatus maint/travis-ci_scripts/50_after_success.bash
+  - maint/getstatus maint/travis-ci_scripts/50_after_success.bash || ( maint/travis-ci_scripts/50_after_failure.bash && /bin/false )
 
 after_failure:
   # Final sysinfo printout on fail