Merge pull request #823 from softace/master_include_branches_in_travis

Added mandatory language key to .travis.yml, ensured to build both master and 1.1_stable branch
2012-09-15 05:09:42 -07:00 · 2012-09-15 05:09:42 -07:00 · 13dee1649f
parent be672f3dcf f14d6ab4b1
commit 13dee1649f
1 changed files with 5 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,3 +1,4 @@
+language: ruby
 rvm:
  - 1.9.2
  - 1.9.3
@ -26,3 +27,7 @@ matrix:
 before_script:
  - sh -e /etc/init.d/xvfb start
  - export DISPLAY=:99.0
+branches:
+  only:
+    - master
+    - 1.1_stable