From 0188dd91a68ce63732292bb009e24bb09e50dc71 Mon Sep 17 00:00:00 2001 From: Martijn Braam Date: Mon, 31 Jul 2017 19:53:23 +0200 Subject: [PATCH] Travis checksum pr fix (#308) * Check the correct branch in PR runs --- test/check_checksums.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/check_checksums.py b/test/check_checksums.py index 704445d1..27f529f9 100755 --- a/test/check_checksums.py +++ b/test/check_checksums.py @@ -7,7 +7,11 @@ def get_changed_files(): try: raw = subprocess.check_output(['git', 'diff', '--name-only', os.environ['TRAVIS_COMMIT_RANGE']]) except (KeyError, subprocess.CalledProcessError) as e: - raw = subprocess.check_output(['git', 'diff', '--name-only', 'HEAD~1']) + if 'TRAVIS_PULL_REQUEST' in os.environ and os.environ['TRAVIS_PULL_REQUEST'] == "true": + branch = os.environ['TRAVIS_PULL_REQUEST_BRANCH'] + raw = subprocess.check_output(['git', 'diff', '--name-only', 'master...{}'.format(branch)]) + else: + raw = subprocess.check_output(['git', 'diff', '--name-only', 'HEAD~1']) return raw.decode().splitlines() @@ -56,6 +60,9 @@ def check_checksums(package): if __name__ == "__main__": if 'TRAVIS_COMMIT_RANGE' in os.environ: print('Checking commit range: {}'.format(os.environ['TRAVIS_COMMIT_RANGE'])) + if 'TRAVIS_PULL_REQUEST_BRANCH' in os.environ: + print('Checking PR branch: {}'.format(os.environ['TRAVIS_PULL_REQUEST_BRANCH'])) + packages = get_changed_packages() if len(packages) == 0: