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
This commit is contained in:
commit
13dee1649f
|
@ -1,3 +1,4 @@
|
||||||
|
language: ruby
|
||||||
rvm:
|
rvm:
|
||||||
- 1.9.2
|
- 1.9.2
|
||||||
- 1.9.3
|
- 1.9.3
|
||||||
|
@ -26,3 +27,7 @@ matrix:
|
||||||
before_script:
|
before_script:
|
||||||
- sh -e /etc/init.d/xvfb start
|
- sh -e /etc/init.d/xvfb start
|
||||||
- export DISPLAY=:99.0
|
- export DISPLAY=:99.0
|
||||||
|
branches:
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
- 1.1_stable
|
||||||
|
|
Loading…
Reference in New Issue