From 1acd3789bb70c39f23c8fb13f0db50402ebb146a Mon Sep 17 00:00:00 2001 From: kennytm Date: Wed, 21 Feb 2018 22:25:12 +0800 Subject: [PATCH] Provides direct link to the PR when toolstate is changed. Fix rust-lang-nursery/rust-toolstate#1. --- src/tools/publish_toolstate.py | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/src/tools/publish_toolstate.py b/src/tools/publish_toolstate.py index b90947e5a434a..e2dbdb301e286 100755 --- a/src/tools/publish_toolstate.py +++ b/src/tools/publish_toolstate.py @@ -17,6 +17,7 @@ import copy import datetime import collections +import textwrap # List of people to ping when the status of a tool changed. MAINTAINERS = { @@ -38,7 +39,12 @@ def read_current_status(current_commit, path): return {} -def update_latest(current_commit, relevant_pr_number, current_datetime): +def update_latest( + current_commit, + relevant_pr_number, + relevant_pr_url, + current_datetime +): '''Updates `_data/latest.json` to match build result of the given commit. ''' with open('_data/latest.json', 'rb+') as f: @@ -50,8 +56,13 @@ def update_latest(current_commit, relevant_pr_number, current_datetime): } slug = 'rust-lang/rust' - message = '📣 Toolstate changed by {}!\n\nTested on commit {}@{}.\n\n' \ - .format(relevant_pr_number, slug, current_commit) + message = textwrap.dedent('''\ + 📣 Toolstate changed by {}! + + Tested on commit {}@{}. + Direct link to PR: <{}> + + ''').format(relevant_pr_number, slug, current_commit, relevant_pr_url) anything_changed = False for status in latest: tool = status['tool'] @@ -90,13 +101,21 @@ def update_latest(current_commit, relevant_pr_number, current_datetime): cur_commit_msg = sys.argv[2] save_message_to_path = sys.argv[3] - relevant_pr_match = re.search('#[0-9]+', cur_commit_msg) + relevant_pr_match = re.search('#([0-9]+)', cur_commit_msg) if relevant_pr_match: - relevant_pr_number = 'rust-lang/rust' + relevant_pr_match.group(0) + number = relevant_pr_match.group(1) + relevant_pr_number = 'rust-lang/rust#' + number + relevant_pr_url = 'https://github.com/rust-lang/rust/pull/' + number else: relevant_pr_number = '' - - message = update_latest(cur_commit, relevant_pr_number, cur_datetime) + relevant_pr_url = '' + + message = update_latest( + cur_commit, + relevant_pr_number, + relevant_pr_url, + cur_datetime + ) if message: print(message) with open(save_message_to_path, 'w') as f: