Skip to content

Commit

Permalink
Add 32-bit build in travis-ci config (libgeos#658)
Browse files Browse the repository at this point in the history
- 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

git-svn-id: http://svn.osgeo.org/geos/trunk@3934 5242fede-7e19-0410-aef8-94bd7d2200fb
  • Loading branch information
Sandro Santilli committed Sep 2, 2013
1 parent 4499c55 commit 00a94c9
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
_build
aclocal.m4
Makefile.in
Makefile
Expand Down
17 changes: 12 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,26 @@ compiler:

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:
#- [email protected] # TODO: whitelist this e-mail
- [email protected]
on_success: change
on_failure: always

3 changes: 2 additions & 1 deletion tools/ci/before_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

2 changes: 1 addition & 1 deletion tools/ci/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ mkdir -p ${builddir}
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

0 comments on commit 00a94c9

Please sign in to comment.