Appveyor CI: always use HEAD for the short commit

Part of 26979.
This commit is contained in:
teor 2018-07-31 12:14:40 +10:00
parent 8425091718
commit 78049afaa5
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A

View File

@ -118,10 +118,6 @@ def appveyor_vars():
] ]
]) ])
vars.update(
short_commit=vars["repo_commit"][:10],
)
BUILD_FMT = u'{url}/project/{account_name}/{project_name}/build/{build_version}' BUILD_FMT = u'{url}/project/{account_name}/{project_name}/build/{build_version}'
if vars["repo_tag_name"]: if vars["repo_tag_name"]:
@ -129,15 +125,20 @@ def appveyor_vars():
else: else:
BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}' BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
vars.update(head_commit=vars["repo_commit"])
if vars["repo_provider"].lower().startswith('github'): if vars["repo_provider"].lower().startswith('github'):
COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}' COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'
if vars["pull_request_number"]: if vars["pull_request_number"]:
vars.update(head_commit=vars["pull_request_head_commit"])
BRANCH_FMT = u'{repo_name} {repo_branch} pull {pull_request_head_repo_name} {pull_request_head_repo_branch} {short_commit}' BRANCH_FMT = u'{repo_name} {repo_branch} pull {pull_request_head_repo_name} {pull_request_head_repo_branch} {short_commit}'
COMMIT_FMT = u'https://github.com/{pull_request_head_repo_name}/commit/{pull_request_head_commit}' COMMIT_FMT = u'https://github.com/{pull_request_head_repo_name}/commit/{pull_request_head_commit}'
PULL_FMT = u'https://github.com/{repo_name}/pull/{pull_request_number}' PULL_FMT = u'https://github.com/{repo_name}/pull/{pull_request_number}'
vars.update(pull_url=PULL_FMT.format(**vars)) vars.update(pull_url=PULL_FMT.format(**vars))
vars.update(commit_url=COMMIT_FMT.format(**vars)) vars.update(commit_url=COMMIT_FMT.format(**vars))
vars.update(short_commit=vars["head_commit"][:10])
vars.update( vars.update(
build_url=BUILD_FMT.format(**vars), build_url=BUILD_FMT.format(**vars),
branch_detail=BRANCH_FMT.format(**vars), branch_detail=BRANCH_FMT.format(**vars),