nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Appveyor CI: Generate correct branches and URLs for pull requests

Browse Source 
Part of 26979.
This commit is contained in:
teor 2018-07-31 11:12:21 +10:00
parent d8ce84aae4
commit 6a870c69bb
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/test/appveyor-irc-notify.py
View File

@ -26,6 +26,7 @@
# Modified by teor in 2018: # Modified by teor in 2018:
# - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently) # - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently)
# - make short commits 10 hexdigits long (that's what git does for tor) # - make short commits 10 hexdigits long (that's what git does for tor)
# - generate correct branches and URLs for pull requests
# This program is free software; you can redistribute it and/or modify it under the # This program is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software Foundation; # terms of the GNU General Public License as published by the Free Software Foundation;
@ -102,6 +103,9 @@ def appveyor_vars():
'APPVEYOR_REPO_COMMIT_TIMESTAMP', 'APPVEYOR_REPO_COMMIT_TIMESTAMP',
'APPVEYOR_REPO_PROVIDER', 'APPVEYOR_REPO_PROVIDER',
'APPVEYOR_PROJECT_NAME', 'APPVEYOR_PROJECT_NAME',
'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME',
'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH',
'APPVEYOR_PULL_REQUEST_HEAD_COMMIT',
'APPVEYOR_PULL_REQUEST_TITLE', 'APPVEYOR_PULL_REQUEST_TITLE',
'APPVEYOR_BUILD_VERSION', 'APPVEYOR_BUILD_VERSION',
'APPVEYOR_REPO_COMMIT', 'APPVEYOR_REPO_COMMIT',
@ -112,15 +116,25 @@ 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}'
BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'
if vars["repo_provider"].lower().startswith('github'): if vars["repo_provider"].lower().startswith('github'):
COMMIT_FMT = u'https://{repo_provider}.com/{repo_name}/commit/{repo_commit}' COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'
if vars["pull_request_number"]:
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}'
PULL_FMT = u'https://github.com/{repo_name}/pull/{pull_request_number}'
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( vars.update(
build_url=BUILD_FMT.format(**vars), build_url=BUILD_FMT.format(**vars),
short_commit=vars["repo_commit"][:10], branch_detail=BRANCH_FMT.format(**vars),
) )
return vars return vars
@ -138,7 +152,7 @@ def notify():
if success or failure: if success or failure:
messages = [] messages = []
messages.append(u"{repo_name} {repo_branch} {short_commit} - {repo_commit_author}: {repo_commit_message}") messages.append(u"{branch_detail} - {repo_commit_author}: {repo_commit_message}")
if success: if success:
m = u"Build #{build_version} passed. Details: {build_url}" m = u"Build #{build_version} passed. Details: {build_url}"
@ -148,6 +162,9 @@ def notify():
if "commit_url" in apvy_vars: if "commit_url" in apvy_vars:
m += " Commit: {commit_url}" m += " Commit: {commit_url}"
if "pull_url" in apvy_vars:
m += " Pull: {pull_url}"
messages.append(m) messages.append(m)
else: else:
messages = sys.argv[3:] messages = sys.argv[3:]