commit 9b41eb2bc3294f9bf0cf85d75fe2680efcebcc0e Author: teor teor@torproject.org Date: Tue Jul 31 11:12:21 2018 +1000

Appveyor CI: Generate correct branches and URLs for pull requests

Part of 26979. --- scripts/test/appveyor-irc-notify.py | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py index fc2ead164..f830db4e4 100644 --- a/scripts/test/appveyor-irc-notify.py +++ b/scripts/test/appveyor-irc-notify.py @@ -26,6 +26,7 @@ # Modified by teor in 2018: # - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently) # - 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 # 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_PROVIDER', '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_BUILD_VERSION', '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}' + BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}'

if vars["repo_provider"].lower().startswith('github'): - COMMIT_FMT = u'https://%7Brepo_provider%7D.com/%7Brepo_name%7D/commit/%7Brepo_commit%7D' + COMMIT_FMT = u'https://github.com/%7Brepo_name%7D/commit/%7Brepo_commit%7D' + 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/%7Bpull_request_head_repo_name%7D/commit/%7Bpull_request_...' + PULL_FMT = u'https://github.com/%7Brepo_name%7D/pull/%7Bpull_request_number%7D' + vars.update(pull_url=PULL_FMT.format(**vars)) vars.update(commit_url=COMMIT_FMT.format(**vars))

vars.update( build_url=BUILD_FMT.format(**vars), - short_commit=vars["repo_commit"][:10], + branch_detail=BRANCH_FMT.format(**vars), ) return vars

@@ -138,7 +152,7 @@ def notify():

if success or failure: 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: m = u"Build #{build_version} passed. Details: {build_url}" @@ -147,7 +161,10 @@ def notify():

if "commit_url" in apvy_vars: m += " Commit: {commit_url}" - + + if "pull_url" in apvy_vars: + m += " Pull: {pull_url}" + messages.append(m) else: messages = sys.argv[3:]