From f6657b3049dd7a1929dee26a48144d37ba3a2cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 26 May 2014 07:49:54 +0200 Subject: [PATCH 1/2] also watch master and next for deployment --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aa9687ed3a..4008afec3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,11 @@ script: - make all - make test -# Only watch the development branch. +# Only watch the development and release branches. branches: only: + - master + - next - bleed # Notify developers when build passed/failed. From b304f4754c07165d86a5d38dc1647a47564a1253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 26 May 2014 07:50:12 +0200 Subject: [PATCH 2/2] we don't support SDL 1.2 anymore --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4008afec3e..02949f0030 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ language: c # Make sure build dependencies are installed. install: - - sudo apt-get install mono-gmcs cli-common-dev libsdl1.2debian libgl1-mesa-glx libopenal1 libfreetype6 dpkg rpm nsis markdown + - sudo apt-get install mono-gmcs cli-common-dev libgl1-mesa-glx libopenal1 libfreetype6 dpkg rpm nsis markdown cache: apt # Run the build script