check whether pr merged (#21752)

* release_iseus_status_auto_reply * issue_aoto_close_revert * Update main.py * Update main.py * Update update_issue_body.py * Update reply_generator.py * Update reply_generator.py * Update update_issue_body.py * Update main.py * Update update_issue_body.py * Update update_issue_body.py * Update main.py * Update reply_generator.py * Update main.py * Update update_issue_body.py * Update main.py * Update scripts/release_issue_status/update_issue_body.py * Update update_issue_body.py * Update main.py * Update reply_generator.py * Update update_issue_body.py * Update main.py * Update scripts/release_issue_status/main.py * Update main.py * Update scripts/release_issue_status/main.py * Update scripts/release_issue_status/main.py * Update scripts/release_issue_status/main.py * Update scripts/release_issue_status/update_issue_body.py * Update scripts/release_issue_status/main.py * Update scripts/release_issue_status/update_issue_body.py * Update reply_generator.py * Update main.py * Update scripts/release_issue_status/update_issue_body.py Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com> * Update scripts/release_issue_status/update_issue_body.py Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com> * Update reply_generator.py * Update update_issue_body.py * Update main.py * Update main.py * Update update_issue_body.py * Update main.py * Update scripts/release_issue_status/main.py * Update main.py * Update reply_generator.py * Update main.py * Update main.py * Update main.py * Update main.py * Update main.py * Update main.py * Update main.py * Update main.py * Update main.py * Update update_issue_body.py * Update main.py * Update update_issue_body.py * Update reply_generator.py * Update update_issue_body.py * Update main.py * Update update_issue_body.py * Update update_issue_body.py * Update update_issue_body.py * Update update_issue_body.py * Update update_issue_body.py * Update main.py * Update main.py * Update release_issue_status.yml for Azure Pipelines * Update main.py * Update reply_generator.py * Add files via upload * Update reply_generator.py * Update update_issue_body.py * Update reply_generator.py * Update auto_pipeline_run.py * Update auto_pipeline_run.py * add auto-close * Update release_issue_status.yml for Azure Pipelines * Update auto_close.py * Update main.py * Update release_issue_status.yml for Azure Pipelines * Update auto_pipeline_run.py * fix bug * Update main.py * Update auto_close.py * Update auto_close.py * Update main.py * Update reply_generator.py * Update main.py * Update main.py * Update auto_close.py * Update main.py * Update auto-close * Update auto_pipeline_run.py * Update update_issue_body.py * Update auto_pipeline_run.py * Update release_issue_status.yml for Azure Pipelines * Update auto_pipeline_run.py * Update release_issue_status.yml for Azure Pipelines * Update auto_pipeline_run.py * Update auto_pipeline_run.py * Add pipeline link * Update pipeline link * Update auto_pipeline_run.py * Update release_issue_status.yml for Azure Pipelines * Update auto_pipeline_run.py * Update requirement.txt * Update auto_pipeline_run.py * Add get_python_pipeline * Update auto_pipeline_run.py * test * test * add outputfolder * add label * Update main.py * Update get_python_pipeline.py * Update main.py * Update auto_pipeline_run.py * Add utils * Update main.py * Update main.py * Delete old py * Update reply_generator.py * Update main.py * Update main.py * Update main.py * Update main.py * Update main.py * Update utils.py * Update utils.py * Update main.py * Update main.py * Update reply_generator.py * Update utils.py * Add get_changelog function * Update utils.py * Update reply_generator.py * Update main.py * Update reply_generator.py * Update function * del useless code * Update utils.py * Update main.py * Update reply_generator.py * Update main.py * Update utils.py * Update utils.py * Update utils.py * Update utils.py * Update reply_generator.py * Update main.py * Update main.py * Update main.py * Update release_issue_status.yml for Azure Pipelines * Update main.py * Update release_issue_status.yml for Azure Pipelines * Update release_issue_status.yml for Azure Pipelines * Update main.py * Update utils.py * Update auto-close * Update release_issue_status.yml for Azure Pipelines * Update utils.py * Update utils.py * Fix auto-close bug * Update utils.py * Update utils.py * Update utils.py * Update utils.py * Update utils.py * Update release_issue_status.yml for Azure Pipelines * Add assign * Update reply_generator.py * Update reply_generator.py * Update assignee * Update assignee * Update main.py * Update main.py * Update main.py * update md * update md * update md * update md * update md * update md * Update main.py * Update main.py * Update main.py * Update main.py * Update main.py * Update main.py * Update main.py * Update main.py * Update utils.py * Update main.py * Update main.py Co-authored-by: Jiefeng Chen <51037443+BigCat20196@users.noreply.github.com> Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com> Co-authored-by: BigCat20196 <1095260342@qq.com> Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
Azure · Nov 16, 2021 · a2f7db3 · a2f7db3
1 parent 5098d48
commit a2f7db3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/scripts/release_issue_status/main.py b/scripts/release_issue_status/main.py
@@ -145,12 +145,11 @@ def _latest_comment_time(comments, delay_from_create_date):
 
 def auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python_piplines, assigner_repoes):
     logging.info("new issue number: {}".format(item.issue_object.number))
-
+    assigner_repo = assigner_repoes[item.assignee]
     if 'auto-link' not in item.labels:
         item.issue_object.add_to_labels('auto-link')
         try:
-            package_name, readme_link, output_folder = update_issue_body(request_repo, rest_repo,
-                                                                         item.issue_object.number)
+            package_name, readme_link, output_folder = update_issue_body(assigner_repo, rest_repo, item.issue_object.number)
             logging.info("pkname, readme", package_name, readme_link)
             item.package = package_name
             key = ('Python', item.package)
@@ -172,7 +171,6 @@ def auto_reply(item, request_repo, rest_repo, sdk_repo, duplicated_issue, python
     try:
         logging.info(python_piplines)
         pipeline_url = get_pipeline_url(python_piplines, output_folder)
-        assigner_repo = assigner_repoes[item.assignee]
         rg.begin_reply_generate(item=item, rest_repo=rest_repo, readme_link=readme_link,
                                 sdk_repo=sdk_repo, pipeline_url=pipeline_url, assigner_repo=assigner_repo)
         if 'Configured' in item.labels:

diff --git a/scripts/release_issue_status/utils.py b/scripts/release_issue_status/utils.py
@@ -35,7 +35,7 @@ def update_issue_body(sdk_repo, rest_repo, issue_number):
         link = link.split(']')[0]
         link = link.replace('[', "").replace(']', "").replace('(', "").replace(')', "")
 
-    package_name, readme_link, output_folder = _get_pkname_and_readme_link(rest_repo, link)
+    package_name, readme_link, output_folder = _get_pkname_and_readme_link(rest_repo, link, issue_info)
     # Check readme tag format
     if 'package' not in readme_tag:
         readme_tag = 'package-{}'.format(readme_tag)
@@ -53,7 +53,7 @@ def update_issue_body(sdk_repo, rest_repo, issue_number):
     return package_name, readme_link, output_folder
 
 
-def _get_pkname_and_readme_link(rest_repo, link):
+def _get_pkname_and_readme_link(rest_repo, link, issue_info):
     # change commit link to pull json link(i.e. https://github.com/Azure/azure-rest-api-specs/commit/77f5d3b5d2fbae17621ea124485788f496786758#diff-708c2fb843b022cac4af8c6f996a527440c1e0d328abb81f54670747bf14ab1a)
     pk_name = ''
     if 'commit' in link:
@@ -68,6 +68,11 @@ def _get_pkname_and_readme_link(rest_repo, link):
 
         # Get Readme link
         pr_info = rest_repo.get_pull(number=pr_number)
+
+        if not pr_info.merged:
+            issue_info.create_comment(f' @{issue_info.user.login},please merge your pr first. {link}')
+            raise Exception('PR has not been merged')
+
         pk_url_name = set()
         for pr_changed_file in pr_info.get_files():
             contents_url = pr_changed_file.contents_url