Citra-emu/bleeding-edge-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18 from jroweboy/master

Browse Source 
Delete the remote branch before pushing
This commit is contained in:
James Rowe 2017-01-09 21:15:07 -07:00 committed by GitHub
commit 3111e5c61c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tag_build.py
View File

@ -157,6 +157,9 @@ class TagMergeBot:
def sync(self): def sync(self):
_git("push", "-f", self.push_repo["name"], "master", cwd=self.tracking_path) _git("push", "-f", self.push_repo["name"], "master", cwd=self.tracking_path)
def remove_remote_branch(self):
_git("push", self.push_repo["name"], "--delete", self.branch_name, cwd=self.tracking_path)
def push(self): def push(self):
_git("push", "-f", self.push_repo["name"], self.branch_name, cwd=self.tracking_path) _git("push", "-f", self.push_repo["name"], self.branch_name, cwd=self.tracking_path)
@ -208,6 +211,7 @@ if __name__ == "__main__":
t.pull_branches() t.pull_branches()
failed = t.merge() failed = t.merge()
logger.info("Number of failed merges: {failed}".format(failed=failed)) logger.info("Number of failed merges: {failed}".format(failed=failed))
t.remove_remote_branch()
t.push() t.push()
# save this runs information # save this runs information