From c8bd27f1e80a94320c56a641a85e78fb81490160 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Fri, 1 Apr 2016 13:28:25 -0500 Subject: [PATCH] Rebase PRs against $TRAVIS_BRANCH before performing tests --- lib/ansible/modules/extras/.travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/ansible/modules/extras/.travis.yml b/lib/ansible/modules/extras/.travis.yml index 5e09a9a447..4dc70de2f6 100644 --- a/lib/ansible/modules/extras/.travis.yml +++ b/lib/ansible/modules/extras/.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