diff options
| author |  jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> | 2019-05-13 13:04:23 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2019-05-13 13:04:23 -0700 |
| commit | a181b4336421605509b95baf9c0d628ce0443672 (patch) | |
| tree | 4024569f7c534f0dbf67330c95c15101491eb4b8 /infra/travis | |
| parent | 8017ffc384ea91d0eed5644458db2bccd660617d (diff) | |
[travis] Add requirements file for travis and fix diff command (#2406)
Diffstat (limited to 'infra/travis')
| -rw-r--r-- | infra/travis/requirements.txt | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | infra/travis/travis_build.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/infra/travis/requirements.txt b/infra/travis/requirements.txt new file mode 100644 index 00000000..37917bb2 --- /dev/null +++ b/infra/travis/requirements.txt @@ -0,0 +1 @@ +PyYAML==5.1 diff --git a/infra/travis/travis_build.py b/infra/travis/travis_build.py index 60f4ab40..13c03ac8 100644..100755 --- a/infra/travis/travis_build.py +++ b/infra/travis/travis_build.py @@ -30,8 +30,10 @@ DEFAULT_SANITIZERS = ['address', 'undefined'] def get_modified_projects(): """Get a list of all the projects modified in this commit.""" - output = subprocess.check_output(['git', 'diff', 'origin/master', - '--name-status']) + master_head_sha = subprocess.check_output( + ['git', 'merge-base', 'HEAD', 'FETCH_HEAD']).decode().strip() + output = subprocess.check_output( + ['git', 'diff', '--name-only', 'HEAD', master_head_sha]).decode() projects_regex = '.*projects/(?P<name>.*)/.*\n' return set(re.findall(projects_regex, output)) |