X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=.travis.yml;h=dedc4193d1cf84764fcb3da7639e92ee597dc2ac;hb=029e9d1eef4396f25f2badadbabfe936712cf15e;hp=3c04b88ebe2de0939add35471ac00e78af14da70;hpb=94e2411528707a4de79444072d843f1e2c1e310b;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/.travis.yml b/.travis.yml
index 3c04b88..dedc419 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,14 +68,19 @@ x_disabled_notifications:
 language: perl
 
 perl:
-  - "5.18"
+  - 5.20-extras
+  - "5.20" # needs quoting due to trailing zero
+  - 5.18-extras
+  - 5.18
 
 env:
-  - CLEANTEST=false
+  - CLEANTEST=false DBICTEST_DB2=true
+  - CLEANTEST=false DBICTEST_ORA=true
+  - CLEANTEST=false DBICTEST_FIREBIRD=true
   - CLEANTEST=false DBICTEST_MYSQL_INNODB=1
   - CLEANTEST=true
 
-x_disabled_matrix:
+matrix:
   fast_finish: true
   include:
     # this particular perl is quite widespread
@@ -113,6 +118,7 @@ x_disabled_matrix:
         - BREWOPTS="-Duseithreads"
         - BREWVER=5.8.5
         - DBIC_TRACE_PROFILE=console
+        - DBICTEST_MYSQL_INNODB=1
 
     # Full Test of minimum supported without threads
     - perl: 5.8.3_nt
@@ -121,6 +127,7 @@ x_disabled_matrix:
         - BREWOPTS=""
         - BREWVER=5.8.3
         - DBIC_TRACE_PROFILE=console_monochrome
+        - DBICTEST_MYSQL_INNODB=1
 
     ###
     # some permutations of tracing and envvar poisoning
@@ -131,6 +138,7 @@ x_disabled_matrix:
         - POISON_ENV=true
         - DBIC_TRACE=1
         - DBIC_MULTICREATE_DEBUG=0
+        - DBICTEST_MYSQL_INNODB=1
         - BREWOPTS="-Duseithreads -Dusemorebits"
         - BREWVER=5.16.2
 
@@ -146,6 +154,7 @@ x_disabled_matrix:
         - POISON_ENV=true
         - DBIC_TRACE=1
         - DBIC_TRACE_PROFILE=console
+        - DBICTEST_MYSQL_INNODB=1
 
     - perl: 5.18
       env:
@@ -154,6 +163,7 @@ x_disabled_matrix:
         - DBIC_TRACE=1
         - DBIC_TRACE_PROFILE=console_monochrome
         - DBIC_MULTICREATE_DEBUG=0
+        - DBICTEST_MYSQL_INNODB=1
 
     ###
     # Start of the allow_failures block
@@ -189,6 +199,7 @@ x_disabled_matrix:
         - BREWOPTS="-Duseithreads -Dusemorebits"
         - BREWVER=5.18.2
         - DEVREL_DEPS=true
+        - DBICTEST_MYSQL_INNODB=1
 
     # bleadperl with stock CPAN, full depchain test
     - perl: bleadperl
@@ -203,6 +214,7 @@ x_disabled_matrix:
         - BREWOPTS="-Duseithreads -Dusemorebits"
         - BREWVER=blead
         - DEVREL_DEPS=true
+        - DBICTEST_MYSQL_INNODB=1
 
 
   # which ones of the above can fail
@@ -216,6 +228,10 @@ x_disabled_matrix:
     - perl: bleadperl
     - perl: devcpan_bleadperl_thr_mb
 
+    # Several upstream deps are flaky on 5.8.3
+    - perl: 5.8.3_nt
+    - perl: 5.8.3_nt_mb
+
 
 # sourcing the files is *EXTREMELY* important - otherwise
 # no envvars will survive
@@ -224,42 +240,57 @@ x_disabled_matrix:
 # console output
 
 before_install:
+  # common functions for all run phases below
+  #
+  # this is an exporter - sourcing it is crucial
+  # among other things it also sets -e
+  #
+  - source maint/travis-ci_scripts/common.bash
+
   # Sets global envvars, downloads/configures debs based on CLEANTEST
   # Sets extra DBICTEST_* envvars
   #
+  # this is an exporter - sourcing it is crucial
+  #
   - source maint/travis-ci_scripts/10_before_install.bash
 
 install:
   # Build and switch to a custom perl if requested
   # Configure the perl env, preinstall some generic toolchain parts
   #
+  # this is an exporter - sourcing it is crucial
+  #
   - source maint/travis-ci_scripts/20_install.bash
 
+###
+### From this point on -e is *unset*, rely on travis' error handling
+###
+  - set +e
+
 before_script:
   # Preinstall/install deps based on envvars/CLEANTEST
   #
-  - source 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
   #
-  - source maint/travis-ci_scripts/40_script.bash
+  - maint/getstatus maint/travis-ci_scripts/40_script.bash
 
 after_success:
-  # Check if we can assemble a dist properly if not in CLEANTEST
-  # skipped for now
-  # - source maint/travis-ci_scripts/50_after_success.bash
+  # No tasks yet
+  #
+  # - maint/getstatus maint/travis-ci_scripts/50_after_success.bash
 
 after_failure:
-  # No tasks yet
+  # Final sysinfo printout on fail
   #
-  #- source maint/travis-ci_scripts/50_after_failure.bash
+  - maint/getstatus maint/travis-ci_scripts/50_after_failure.bash
 
 after_script:
   # No tasks yet
   #
-  #- source maint/travis-ci_scripts/60_after_script.bash
-
-  # if we do not unset this before we terminate the travis teardown will
-  # mark the entire job as failed
-  - set +e
+  #- maint/getstatus maint/travis-ci_scripts/60_after_script.bash