mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Fix change detection on retried Shippable jobs.
This commit is contained in:
parent
6b40906bdb
commit
c0aaf0fff7
2 changed files with 4 additions and 3 deletions
|
@ -57,6 +57,7 @@ class ShippableChanges(object):
|
|||
self.is_tag = os.environ['IS_GIT_TAG'] == 'true'
|
||||
self.commit = os.environ['COMMIT']
|
||||
self.project_id = os.environ['PROJECT_ID']
|
||||
self.commit_range = os.environ['SHIPPABLE_COMMIT_RANGE']
|
||||
except KeyError as ex:
|
||||
raise MissingEnvironmentVariable(name=ex.args[0])
|
||||
|
||||
|
@ -64,8 +65,8 @@ class ShippableChanges(object):
|
|||
raise ChangeDetectionNotSupported('Change detection is not supported for tags.')
|
||||
|
||||
if self.is_pr:
|
||||
self.paths = sorted(git.get_diff_names(['origin/%s' % self.branch, '--']))
|
||||
self.diff = git.get_diff(['origin/%s' % self.branch, '--'])
|
||||
self.paths = sorted(git.get_diff_names([self.commit_range]))
|
||||
self.diff = git.get_diff([self.commit_range])
|
||||
else:
|
||||
merge_runs = self.get_merge_runs(self.project_id, self.branch)
|
||||
last_successful_commit = self.get_last_successful_commit(git, merge_runs)
|
||||
|
|
|
@ -21,7 +21,7 @@ class Git(object):
|
|||
def get_diff(self, args, git_options=None):
|
||||
"""
|
||||
:type args: list[str]
|
||||
:type options: list[str]
|
||||
:type git_options: list[str] | None
|
||||
:rtype: list[str]
|
||||
"""
|
||||
cmd = ['diff'] + args
|
||||
|
|
Loading…
Reference in a new issue