[geos-commits] r4073 - branches/3.4

[svn_geos at osgeo.org]

Author: mloskot
Date: 2015-08-06 08:39:37 -0700 (Thu, 06 Aug 2015)
New Revision: 4073

Modified:
   branches/3.4/
   branches/3.4/.travis.yml
Log:
Merged revision(s) 4072 from trunk:
Allow failure for CMake x64 build on Travis CI.
This should eliminate unimportant signal and keep the core GEOS builds green.



Property changes on: branches/3.4
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3981,4054,4062-4064,4068-4069
   + /trunk:3981,4054,4062-4064,4068-4069,4072

Modified: branches/3.4/.travis.yml
===================================================================
--- branches/3.4/.travis.yml	2015-08-06 15:17:03 UTC (rev 4072)
+++ branches/3.4/.travis.yml	2015-08-06 15:39:37 UTC (rev 4073)
@@ -16,12 +16,16 @@
     - clang
 
 env:
-    matrix:
-        - GEOS_BUILD_TOOL=autotools CFLAGS=-m32 CXXFLAGS=-m32
-        - GEOS_BUILD_TOOL=autotools CFLAGS=-m64 CXXFLAGS=-m64
-        - GEOS_BUILD_TOOL=cmake CFLAGS=-m32 CXXFLAGS=-m32
-        - GEOS_BUILD_TOOL=cmake CFLAGS=-m64 CXXFLAGS=-m64
+    - GEOS_BUILD_TOOL=autotools CFLAGS=-m32 CXXFLAGS=-m32
+    - GEOS_BUILD_TOOL=autotools CFLAGS=-m64 CXXFLAGS=-m64
+    - GEOS_BUILD_TOOL=cmake CFLAGS=-m32 CXXFLAGS=-m32
+    - GEOS_BUILD_TOOL=cmake CFLAGS=-m64 CXXFLAGS=-m64
 
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: GEOS_BUILD_TOOL=cmake CFLAGS=-m64 CXXFLAGS=-m64
+
 addons:
   apt:
     packages: