From be23a20c2e25ba9ce575bf9f26de2faa185e3c92 Mon Sep 17 00:00:00 2001 From: uy/sun Date: Thu, 9 Feb 2023 21:42:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=A0=87=E7=AD=BE=E6=B2=A1=E6=9C=89=E6=89=93?= =?UTF-8?q?=E4=B8=8A=E7=9A=84=E9=97=AE=E9=A2=98=20(#106)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 需要等创建完拉取请求并打上标签后修改议题标题，不然会因为修改议题触发 Actions 导致标签没有正常打上 --- CHANGELOG.md | 1 + src/bot.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65473fdf..d12229fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/lang/zh-CN/ - rc3 默认不自带 fastapi，修改为 none 驱动 - 修复插件测试中创建项目失败时，没有正确判断的问题 - 修复 Actions 排队后未能正确跳过关闭的议题的问题 +- 修复拉取请求标签没有打上的问题 ### Changed diff --git a/src/bot.py b/src/bot.py index ac5376a1..ad444ee0 100644 --- a/src/bot.py +++ b/src/bot.py @@ -142,12 +142,6 @@ def process_publish_check( if isinstance(info, PublishInfo): # 拉取请求与议题的标题 title = f"{info.get_type().value}: {info.name}" - # 修改议题标题 - if issue.title != title: - self.github.rest.issues.update( - self.owner, self.name, issue.number, title=title - ) - logging.info(f"议题标题已修改为 {title}") # 创建新分支 # 命名示例 publish/issue123 branch_name = f"{BRANCH_NAME_PREFIX}{issue.number}" @@ -157,6 +151,14 @@ def process_publish_check( commit_and_push(info, branch_name, issue.number) # 创建拉取请求 self.create_pull_request(info, branch_name, issue.number, title) + # 修改议题标题 + # 需要等创建完拉取请求并打上标签后执行 + # 不然会因为修改议题触发 Actions 导致标签没有正常打上 + if issue.title != title: + self.github.rest.issues.update( + self.owner, self.name, issue.number, title=title + ) + logging.info(f"议题标题已修改为 {title}") message = info.validation_message else: message = info.message