Rebase PRs against $TRAVIS_BRANCH before performing tests

9 years ago · d4c73059fe
parent daddc7caf4
commit d4c73059fe
1 changed files with 4 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -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