Merge pull request #1943 from sivel/rebase-prs
Rebase PRs against $TRAVIS_BRANCH before performing tests
This commit is contained in:
commit
154afa7dc1
1 changed files with 4 additions and 0 deletions
|
@ -9,6 +9,10 @@ addons:
|
|||
packages:
|
||||
- python2.4
|
||||
- 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:
|
||||
- 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
|
||||
|
|
Loading…
Reference in a new issue