summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2012-10-23 13:03:19 -0700
committerBen Longbons <b.r.longbons@gmail.com>2012-10-23 13:03:19 -0700
commita2b835417a4d8689857c4187c9b2f35535e0913e (patch)
tree77b460fa263a108d6e48bf844142d9a90b17cc6c
parent53a70045ca3919cd8a161c1f9f4c7a30713e8747 (diff)
downloadtmwa-a2b835417a4d8689857c4187c9b2f35535e0913e.tar.gz
tmwa-a2b835417a4d8689857c4187c9b2f35535e0913e.tar.bz2
tmwa-a2b835417a4d8689857c4187c9b2f35535e0913e.tar.xz
tmwa-a2b835417a4d8689857c4187c9b2f35535e0913e.zip
Use a more complex travis build script
-rw-r--r--.travis.yml67
-rwxr-xr-xautomated-build3
2 files changed, 63 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 39dcfb6..09037ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,64 @@
+## Doesn't appear to do anything useful.
language: cpp
-compiler:
- - gcc
- - clang
-script: ./automated-build
+
+## Notifications
+## The default is to send email on all failures and changed success
+## Adding other notifiers (like IRC) does not disable the email one
+notifications:
+ ## This is, in fact, the default email setting so it is unnecessary.
+ ## It would probably be too annoying to set on_success: always
+ email:
+ on_success: changed
+ on_failure: always
+ ## Are we going to want this on or off?
+ irc:
+ # TMW irc doesn't work for some reason; freenode does ...
+ # I'm leaving it like this because it's what I'd like to use.
+ channels: "irc.themanaworld.org#tmw-dev"
+ on_success: always
+ on_failure: always
+
+## Commands before installing prerequisites
+before_install: export CC=${REAL_CC} CXX=${REAL_CXX}
+# before_install: git submodule update --init --recursive
+
+## Install prerequisites
+install:
+# if > or | folding is used, error
+# but YAML folds by default on this, so it works (I hope)
+ -
+ if [ "${REAL_CXX}" = "g++-4.7" ];
+ then
+ sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test &&
+ sudo apt-get update -qq;
+ fi
+ - sudo apt-get install -qq ${REAL_CXX}
+
+## Do something before the main test script
+# before_script: ...
+
+## Main test script
+script:
+ - make -k -j2 CC=${REAL_CC} CXX=${REAL_CXX}
+
+## Do something after the main test script
+# after_script: ...
+
+### The rest of the file creates a build matrix
+### containing gcc-4.4 through gcc-4.7 and clang-3.1
+
+## This doesn't work - travis defaults to plain gcc if unknown
+# compiler: gcc-4.4
+# compiler: gcc-4.5
+# compiler: gcc-4.6
+# compiler: gcc-4.7
+# compiler: clang
+
+## Environment variables to expand the build matrix
+## Needed because compiler: gcc overwrites CC and CXX
+env:
+ - REAL_CC=gcc-4.4 REAL_CXX=g++-4.4
+ - REAL_CC=gcc-4.5 REAL_CXX=g++-4.5
+ - REAL_CC=gcc-4.6 REAL_CXX=g++-4.6
+ - REAL_CC=gcc-4.7 REAL_CXX=g++-4.7
+ - REAL_CC=clang REAL_CXX=clang++
diff --git a/automated-build b/automated-build
deleted file mode 100755
index cad4475..0000000
--- a/automated-build
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# ./configure && make
-make CXX=${CXX:-g++}