Compare commits
2 Commits
master
...
MultipleCo
Author | SHA1 | Date | |
---|---|---|---|
|
de9d594758 | ||
|
8decb35652 |
|
@ -168,6 +168,7 @@ class GiteaStatusPush(http.ReporterBase):
|
|||
if 'pr_id' in props:
|
||||
repository_name = props['head_reponame']
|
||||
repository_owner = props['head_owner']
|
||||
sha = props['head_sha']
|
||||
elif 'repository_name' in props:
|
||||
repository_name = props['repository_name']
|
||||
else:
|
||||
|
|
|
@ -17,7 +17,7 @@ class Gitea(Git):
|
|||
@defer.inlineCallbacks
|
||||
def _fetch(self, arg):
|
||||
res = yield super(Gitea, self)._fetch(arg)
|
||||
if self.build.hasProperty("pr_id"):
|
||||
if self.build.hasProperty("pr_id") and self.repourl == self.build.getProperty("base_git_ssh_url", None):
|
||||
remote = yield self._dovccmd(
|
||||
['config', 'remote.pr_source.url'], collectStdout=True, abandonOnFailure=False)
|
||||
if remote is None or remote.strip() is '':
|
||||
|
@ -30,4 +30,4 @@ class Gitea(Git):
|
|||
self.build.getProperty("head_git_ssh_url", None)])
|
||||
yield self._dovccmd(['fetch', 'pr_source'])
|
||||
res = yield self._dovccmd(['merge', self.build.getProperty("head_sha", None)])
|
||||
defer.returnValue(res)
|
||||
defer.returnValue(res)
|
||||
|
|
Loading…
Reference in New Issue
Block a user