diff --git a/.github/scripts/trymerge.py b/.github/scripts/trymerge.py index 95311d2d9b83..4abf32aabf0f 100755 --- a/.github/scripts/trymerge.py +++ b/.github/scripts/trymerge.py @@ -2114,6 +2114,7 @@ def merge( pr.org, pr.project, ignore_current, + comment_id, ) # probably a bad name, but this is a list of current checks that should be diff --git a/.github/scripts/trymerge_explainer.py b/.github/scripts/trymerge_explainer.py index 22797909714a..93430860ee81 100644 --- a/.github/scripts/trymerge_explainer.py +++ b/.github/scripts/trymerge_explainer.py @@ -24,6 +24,7 @@ class TryMergeExplainer: org: str project: str ignore_current: bool + comment_id: int has_trunk_label: bool has_ciflow_label: bool @@ -36,6 +37,7 @@ def __init__( org: str, project: str, ignore_current: bool, + comment_id: int, ): self.force = force self.labels = labels @@ -43,6 +45,7 @@ def __init__( self.org = org self.project = project self.ignore_current = ignore_current + self.comment_id = comment_id def _get_flag_msg( self, @@ -73,12 +76,16 @@ def get_merge_message( ) -> str: title = "### Merge started" main_message = self._get_flag_msg(ignore_current_checks) + gh_run_url = os.getenv("GH_RUN_URL") + gh_comment_url = f"https://github.com/{self.org}/{self.project}/pull/{self.pr_num}#issuecomment-{self.comment_id}" advanced_debugging = "\n".join( ( "
Advanced Debugging", - "Check the merge workflow status ", - f"here", + "
", + f" * [Merge workflow status][{gh_run_url}]", + f" * [Merge trigger][{gh_comment_url}]", + "
", "
", ) )