From 980e0bf52c15bdf179c58b2d4f1085e26f8a3e2a Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Sat, 18 Jan 2014 10:37:27 -0700 Subject: [PATCH] Fix Travis for PRs against non-master (like release, for example) Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) --- .travis.yml | 7 ++++++- hack/travis/env.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f6c83997aa..0650c368d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,13 @@ before_script: - sudo apt-get update -qq - sudo apt-get install -qq python-yaml - git remote add upstream git://github.com/dotcloud/docker.git - - git fetch --append --no-tags upstream refs/heads/master:refs/remotes/upstream/master + - upstream=master; + if [ "$TRAVIS_PULL_REQUEST" != false ]; then + upstream=$TRAVIS_BRANCH; + fi; + git fetch --append --no-tags upstream refs/heads/$upstream:refs/remotes/upstream/$upstream # sometimes we have upstream master already as origin/master (PRs), but other times we don't, so let's just make sure we have a completely unambiguous way to specify "upstream master" from here out +# but if it's a PR against non-master, we need that upstream branch instead :) script: - hack/travis/dco.py diff --git a/hack/travis/env.py b/hack/travis/env.py index 86d90f1567..9830b8df34 100644 --- a/hack/travis/env.py +++ b/hack/travis/env.py @@ -6,7 +6,7 @@ if 'TRAVIS' not in os.environ: exit(127) if os.environ['TRAVIS_PULL_REQUEST'] != 'false': - commit_range = [os.environ['TRAVIS_BRANCH'], 'FETCH_HEAD'] + commit_range = ['upstream/' + os.environ['TRAVIS_BRANCH'], 'FETCH_HEAD'] else: try: subprocess.check_call([