vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix bug which caused manual builds to always build the master branch

Browse source
This commit is contained in:
Joseph Schorr 2014-10-29 12:04:34 -04:00
parent e9c2e54dbc
commit e7f98d991f
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
endpoints/trigger.py
View file

@ -403,12 +403,13 @@ class GithubBuildTrigger(BuildTrigger):
gh_client = self._get_client(auth_token) gh_client = self._get_client(auth_token)
repo = gh_client.get_repo(source) repo = gh_client.get_repo(source)
master = repo.get_branch(repo.default_branch) branch_name = run_parameters.get('branch_name') or repo.default_branch
master_sha = master.commit.sha branch = repo.get_branch(branch_name)
short_sha = GithubBuildTrigger.get_display_name(master_sha) branch_sha = branch.commit.sha
ref = 'refs/heads/%s' % (run_parameters.get('branch_name') or repo.default_branch) short_sha = GithubBuildTrigger.get_display_name(branch_sha)
ref = 'refs/heads/%s' % (branch_name)
return self._prepare_build(config, repo, master_sha, short_sha, ref) return self._prepare_build(config, repo, branch_sha, short_sha, ref)
except GithubException as ghe: except GithubException as ghe:
raise TriggerStartException(ghe.data['message']) raise TriggerStartException(ghe.data['message'])