[geos-commits] r3934 - in trunk: . tools/ci

[svn_geos at osgeo.org]

Author: strk
Date: 2013-09-02 05:14:42 -0700 (Mon, 02 Sep 2013)
New Revision: 3934

Modified:
   trunk/.gitignore
   trunk/.travis.yml
   trunk/tools/ci/before_install.sh
   trunk/tools/ci/script.sh
Log:
Add 32-bit build in travis-ci config (#658)

- Add 32-bit builds to Travis CI matrix
- Install gcc-multilib on Travis CI for -m32
- Add IRC use_notice to Travis CI notifications
- Set on_success and on_failure separately for IRC and email
- Ignore _build - convenient for CMake builds

Patch by Mateusz Loskot

Modified: trunk/.gitignore
===================================================================
--- trunk/.gitignore	2013-08-31 10:38:10 UTC (rev 3933)
+++ trunk/.gitignore	2013-09-02 12:14:42 UTC (rev 3934)
@@ -1,3 +1,4 @@
+_build
 aclocal.m4
 Makefile.in
 Makefile

Modified: trunk/.travis.yml
===================================================================
--- trunk/.travis.yml	2013-08-31 10:38:10 UTC (rev 3933)
+++ trunk/.travis.yml	2013-09-02 12:14:42 UTC (rev 3934)
@@ -15,19 +15,26 @@
 
 env:
     matrix:
-        - GEOS_TRAVIS_BUILD=autotools
-        - GEOS_TRAVIS_BUILD=cmake
+        - 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
 
 before_install: ./tools/ci/before_install.sh
 
 script: ./tools/ci/script.sh
 
 notifications:
-    on_success: always # [always|never|change] # default: change
-    on_failure: always # [always|never|change] # default: always
-    irc: "chat.freenode.net#postgis"
+    irc:
+        channels:
+            - "chat.freenode.net#postgis"
+        on_success: always # [always|never|change] # default: change
+        on_failure: always # [always|never|change] # default: always
+        use_notice: true
     email:
         recipients:
             #- geos-devel at lists.osgeo.org # TODO: whitelist this e-mail
             - mateusz at loskot.net
+        on_success: change
+        on_failure: always
 

Modified: trunk/tools/ci/before_install.sh
===================================================================
--- trunk/tools/ci/before_install.sh	2013-08-31 10:38:10 UTC (rev 3933)
+++ trunk/tools/ci/before_install.sh	2013-09-02 12:14:42 UTC (rev 3934)
@@ -12,7 +12,8 @@
 source ${TRAVIS_BUILD_DIR}/tools/ci/common.sh
 
 sudo apt-get update -qq
+sudo apt-get install -qq gcc-multilib g++-multilib
 
-before_install="${TRAVIS_BUILD_DIR}/tools/ci/before_install_${GEOS_TRAVIS_BUILD}.sh"
+before_install="${TRAVIS_BUILD_DIR}/tools/ci/before_install_${GEOS_BUILD_TOOL}.sh"
 [ -x ${before_install} ] && ${before_install} || echo "nothing to run"
 

Modified: trunk/tools/ci/script.sh
===================================================================
--- trunk/tools/ci/script.sh	2013-08-31 10:38:10 UTC (rev 3933)
+++ trunk/tools/ci/script.sh	2013-09-02 12:14:42 UTC (rev 3934)
@@ -17,4 +17,4 @@
 cd ${builddir}
 
 # build and run tests
-${TRAVIS_BUILD_DIR}/tools/ci/script_${GEOS_TRAVIS_BUILD}.sh
+${TRAVIS_BUILD_DIR}/tools/ci/script_${GEOS_BUILD_TOOL}.sh