cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1943 from sivel/rebase-prs

Browse source 
Rebase PRs against $TRAVIS_BRANCH before performing tests
This commit is contained in:
Matt Martz 2016-04-01 14:15:12 -05:00
commit 154afa7dc1
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -9,6 +9,10 @@ addons:
packages: packages:
- python2.4 - python2.4
- python2.6 - python2.6
before_install:
- git config user.name "ansible"
- git config user.email "ansible@ansible.com"
- if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then git rebase $TRAVIS_BRANCH; fi;
install: install:
- pip install git+https://github.com/ansible/ansible.git@devel#egg=ansible - pip install git+https://github.com/ansible/ansible.git@devel#egg=ansible
- pip install git+https://github.com/sivel/ansible-testing.git#egg=ansible_testing - pip install git+https://github.com/sivel/ansible-testing.git#egg=ansible_testing