aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Merritt <[email protected]>2013-04-05 14:30:03 -0700
committerEric Merritt <[email protected]>2013-04-05 14:30:03 -0700
commit073c7cde01902fb8fbed483af2d8de85310a8151 (patch)
treed082aadeb6757dbd661637d9d400baca2973775f
parente558f8ca39be47bca0cc4b2ea09d86d98419ded8 (diff)
parent1a919d620699602cc0235aea9d3831ffb2540cf3 (diff)
downloadrelx-073c7cde01902fb8fbed483af2d8de85310a8151.tar.gz
relx-073c7cde01902fb8fbed483af2d8de85310a8151.tar.bz2
relx-073c7cde01902fb8fbed483af2d8de85310a8151.zip
Merge pull request #40 from tsloughter/next
Merging this as the R14B* problems are preexisting and will be fixed in a separate patch.
-rw-r--r--.travis.yml7
-rw-r--r--Makefile2
-rw-r--r--README.md2
3 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 3832235..b105084 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
language: erlang
otp_release:
+ - R16B
+ - R15B03
- R15B02
- R15B01
- R15B
@@ -10,4 +12,7 @@ script: "make rebuild"
branches:
only:
- master
- - next \ No newline at end of file
+notifications:
+ email:
+ irc: "irc.freenode.org#erlware" \ No newline at end of file
diff --git a/Makefile b/Makefile
index 5bbe08f..3be2ee3 100644
--- a/Makefile
+++ b/Makefile
@@ -112,6 +112,6 @@ clean: clean-common-test-data
distclean: clean
- rm -rf $(DEPS_PLT)
- - rm -rvf $(CURDIR)/deps/*
+ - rm -rvf $(CURDIR)/deps
rebuild: distclean deps compile escript dialyzer test
diff --git a/README.md b/README.md
index 419bc50..3d11de2 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/tsloughter/relcool.png)](https://travis-ci.org/tsloughter/relcool)
+
# NAME
relcool - A release assembler for erlang