work

Author: dconeybe

firebase-dataconnect/ci/calculate_github_issue_for_commenting.py

@@ -38,8 +38,8 @@ def main() -> None:
   )
 
   file_text = "" if github_issue is None else str(github_issue)
-  logging.info("Writing '%s' to %s", file_text, args.output_file)
-  args.output_file.write_text(file_text, encoding="utf8", errors="replace")
+  logging.info("Writing '%s' to %s", file_text, args.issue_output_file)
+  args.issue_output_file.write_text(file_text, encoding="utf8", errors="replace")
 
 
 def calculate_github_issue(
@@ -120,7 +120,8 @@ def github_issue_from_pr_body(pr_body: str, issue_key: str) -> int | None:
 
 
 class ParsedArgs(typing.Protocol):
-  output_file: pathlib.Path
+  issue_output_file: pathlib.Path
+  pr_output_file: pathlib.Path
   github_ref: str
   github_repository: str
   github_event_name: str
@@ -131,11 +132,17 @@ class ParsedArgs(typing.Protocol):
 def parse_args() -> ParsedArgs:
   arg_parser = argparse.ArgumentParser()
   arg_parser.add_argument(
-    "--output-file",
+    "--issue-output-file",
     required=True,
     help="The file to which to write the calculated issue number"
     "if no issue number was found, then an empty file will be written",
   )
+  arg_parser.add_argument(
+    "--pr-output-file",
+    required=True,
+    help="The file to which to write the calculated triggering PR number"
+    "if no PR was found, then an empty file will be written",
+  )
   arg_parser.add_argument(
     "--github-ref",
     required=True,
@@ -166,7 +173,8 @@ def parse_args() -> ParsedArgs:
   )
 
   parse_result = arg_parser.parse_args()
-  parse_result.output_file = pathlib.Path(parse_result.output_file)
+  parse_result.issue_output_file = pathlib.Path(parse_result.issue_output_file)
+  parse_result.pr_output_file = pathlib.Path(parse_result.pr_output_file)
   return typing.cast("ParsedArgs", parse_result)
 
 

firebase-dataconnect/ci/post_comment_for_job_results.py

@@ -49,7 +49,20 @@ def main() -> None:
 
 
 def generate_message_lines(data: ParsedArgs) -> Iterable[str]:
-  yield f"Result of workflows at {data.github_sha}:"
+  pr_str = data.triggering_pr.strip()
+  pr: int | None
+  if len(pr) == 0:
+    pr = None
+  else:
+    try:
+      pr = int(pr)
+    except ValueError:
+      logging.warning("WARNING: unable to parse PR number as an int: %s", pr)
+      pr = None
+
+  yield f"Posting from Pull Request {pr}: {data.github_repository_html_url}/pull/{pr}"
+
+  yield f"Result of workflow '{data.github_workflow}' at {data.github_sha}:"
 
   for job_result in data.job_results:
     result_symbol = "✅" if job_result.result == "success" else "❌"
@@ -82,6 +95,7 @@ def post_issue_comment_gh_args(
 ) -> Iterable[str]:
   yield "gh"
   yield "issue"
+
   yield "comment"
   yield str(issue_number)
   yield "--body-file"
@@ -112,11 +126,13 @@ class ParsedArgs(typing.Protocol):
   job_results: Sequence[JobResult]
   github_issue: int
   github_repository: str
+  github_workflow: str
   github_sha: str
   github_repository_html_url: str
   github_run_id: str
   github_run_number: str
   github_run_attempt: str
+  triggering_pr: str
 
 
 class ParseError(Exception):
@@ -134,14 +150,25 @@ def parse_args() -> ParsedArgs:
   )
   arg_parser.add_argument(
     "--github-issue",
+    type=int,
     required=True,
     help="The GitHub Issue number to which to post a comment",
   )
+  arg_parser.add_argument(
+    "--triggering-pr",
+    required=True,
+    help="The GitHub Pull Request number that triggered the workflow, or empty if not applicable.",
+  )
   arg_parser.add_argument(
     "--github-repository",
     required=True,
     help="The value of ${{ github.repository }} in the workflow",
   )
+  arg_parser.add_argument(
+    "--github-workflow",
+    required=True,
+    help="The value of ${{ github.workflow }} in the workflow",
+  )
   arg_parser.add_argument(
     "--github-sha",
     required=True,