更新 工作流

.github/workflows/auto_merge_renovate_prs.yml

@@ -2,7 +2,7 @@ name: Auto Process Renovate PRs
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
+    types: [ opened, synchronize, reopened, ready_for_review ]
   workflow_dispatch:
   schedule:
     - cron: '0 * * * *'
@@ -15,10 +15,10 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -36,7 +36,6 @@ jobs:
           import requests
           from typing import Optional, Dict, Any
 
-          # 从环境变量获取GitHub token和仓库信息
           GITHUB_TOKEN = os.getenv('GITHUB_TOKEN')
           REPOSITORY = os.getenv('GITHUB_REPOSITORY')
           HEADERS = {
@@ -59,56 +58,36 @@ jobs:
 
           def parse_version_update(pr_body: str) -> Optional[str]:
               """解析PR正文，确定更新类型"""
-              # 匹配Markdown表格格式
-              # 示例格式:
-              # | Package | Update | Change |
-              # |---------|--------|--------|
-              # | [uusec/openresty-manager](...) | patch | `2.3.4` -> `2.3.5` |
-              
-              # 查找表格行
               lines = pr_body.split('\n')
               in_table = False
 
               for line in lines:
-                  # 检测表格开始
                   if re.search(r'^\s*\|.*Package.*Update.*Change.*\|\s*$', line, re.IGNORECASE):
                       in_table = True
                       continue
 
-                  # 跳过表格分隔线
                   if in_table and re.search(r'^\s*\|[-:|]+\|\s*$', line):
                       continue
 
-                  # 处理表格数据行
                   if in_table and line.strip().startswith('|'):
-                      # 提取单元格内容
                       cells = [cell.strip() for cell in line.split('|') if cell.strip()]
 
                       if len(cells) >= 3:
-                          update_type = cells[1].lower()  # 第二列是更新类型
+                          update_type = cells[1].lower()
 
-                          # 检查更新类型
                           if update_type == 'major':
                               return 'major'
                           elif update_type in ['minor', 'patch']:
                               return update_type
 
-                          # 如果没有明确类型，尝试从版本变化中推断
+                          change_cell = cells[2]
-                          change_cell = cells[2]  # 第三列是版本变化
-                          
-                          # 提取版本号
                           version_pattern = r'(\d+\.\d+\.\d+|\d+\.\d+|\d+)'
                           versions = re.findall(version_pattern, change_cell)
 
                           if len(versions) >= 2:
-                              old_version = versions[0]
+                              old_parts = versions[0].split('.')
-                              new_version = versions[1]
+                              new_parts = versions[1].split('.')
 
-                              # 分割版本号
-                              old_parts = old_version.split('.')
-                              new_parts = new_version.split('.')
-                              
-                              if len(old_parts) > 0 and len(new_parts) > 0:
                               if old_parts[0] != new_parts[0]:
                                   return 'major'
                               elif len(old_parts) > 1 and len(new_parts) > 1 and old_parts[1] != new_parts[1]:
@@ -116,19 +95,57 @@ jobs:
                               else:
                                   return 'patch'
                   elif in_table and not line.strip().startswith('|'):
-                      # 表格结束
                       break
 
               return None
 
+          def is_rebase_checkbox_unchecked(pr_body: str) -> bool:
+              """
+              检查 PR body 中的 rebase checkbox 是否存在且未勾选。
+              Renovate 在 PR body 中插入如下格式的行：
+                - [ ] <!-- rebase-check --> If you want to rebase/retry this PR, check this box.
+              勾选后变为：
+                - [x] <!-- rebase-check --> If you want to rebase/retry this PR, check this box.
+              """
+              # 匹配未勾选状态
+              unchecked_pattern = r'-\s*\[\s*\]\s*<!--\s*rebase-check\s*-->'
+              return bool(re.search(unchecked_pattern, pr_body, re.IGNORECASE))
+
+          def trigger_renovate_rebase(pr_number: int, pr_body: str) -> bool:
+              """
+              通过将 PR body 中的 rebase checkbox 从未勾选改为勾选，
+              触发 Renovate 自动 rebase/retry。
+              返回是否成功更新。
+              """
+              unchecked_pattern = r'(-\s*\[)\s*(\]\s*<!--\s*rebase-check\s*-->)'
+              new_body = re.sub(
+                  unchecked_pattern,
+                  r'\1x\2',
+                  pr_body,
+                  flags=re.IGNORECASE
+              )
+
+              if new_body == pr_body:
+                  print(f"PR #{pr_number} 未找到可勾选的 rebase checkbox，无法触发 rebase")
+                  return False
+
+              url = f'https://api.github.com/repos/{REPOSITORY}/pulls/{pr_number}'
+              data = {'body': new_body}
+              response = requests.patch(url, headers=HEADERS, json=data)
+
+              if response.status_code == 200:
+                  print(f"PR #{pr_number} 已勾选 rebase checkbox，Renovate 将自动触发 rebase/retry")
+                  return True
+              else:
+                  print(f"PR #{pr_number} 更新 body 失败: {response.status_code} {response.text}")
+                  return False
+
           def is_pr_mergeable(pr_number: int) -> bool:
               """检查PR是否可以合并"""
               url = f'https://api.github.com/repos/{REPOSITORY}/pulls/{pr_number}'
               response = requests.get(url, headers=HEADERS)
               response.raise_for_status()
               pr_data = response.json()
-              
-              # 检查合并状态
               return pr_data.get('mergeable', False) and pr_data.get('mergeable_state', '') == 'clean'
 
           def wait_for_checks(pr_number: int, max_wait: int = 600) -> bool:
@@ -138,8 +155,6 @@ jobs:
               while time.time() - start_time < max_wait:
                   if is_pr_mergeable(pr_number):
                       return True
-                  
-                  # 等待30秒后再次检查
                   time.sleep(30)
 
               return False
@@ -147,9 +162,7 @@ jobs:
           def merge_pr(pr_number: int) -> bool:
               """合并PR"""
               url = f'https://api.github.com/repos/{REPOSITORY}/pulls/{pr_number}/merge'
-              data = {
+              data = {'merge_method': 'merge'}
-                  'merge_method': 'merge'
-              }
               response = requests.put(url, headers=HEADERS, json=data)
 
               if response.status_code == 200:
@@ -171,11 +184,10 @@ jobs:
               pr_number = pr['number']
               pr_author = pr['user']['login']
               pr_title = pr['title']
-              pr_body = pr.get('body', '')
+              pr_body = pr.get('body', '') or ''
 
               print(f"处理PR #{pr_number} 来自 {pr_author}: {pr_title}")
 
-              # 解析更新类型
               update_type = parse_version_update(pr_body)
 
               if not update_type:
@@ -185,19 +197,38 @@ jobs:
 
               print(f"PR #{pr_number} 更新类型: {update_type}")
 
-              # 如果是大版本更新，跳过
               if update_type == 'major':
                   print(f"PR #{pr_number} 是大版本更新，跳过")
                   add_comment(pr_number, "⏭️ 自动跳过: 大版本更新需要手动审核")
                   return
 
-              # 检查PR是否可以合并
               if not wait_for_checks(pr_number):
-                  print(f"PR #{pr_number} 在等待时间内未通过检查，跳过")
+                  print(f"PR #{pr_number} 在等待时间内未通过检查")
-                  add_comment(pr_number, "⏰ 自动跳过: 在等待时间内未通过所有检查")
+
+                  # 判断 rebase checkbox 是否存在且未勾选
+                  if is_rebase_checkbox_unchecked(pr_body):
+                      print(f"PR #{pr_number} 检测到未勾选的 rebase checkbox，尝试触发 rebase...")
+                      triggered = trigger_renovate_rebase(pr_number, pr_body)
+                      if triggered:
+                          add_comment(
+                              pr_number,
+                              "🔄 自动触发 Rebase: 检查超时，已自动勾选 rebase checkbox，"
+                              "Renovate 将重新触发 rebase/retry，下次调度时将再次尝试合并。"
+                          )
+                      else:
+                          add_comment(
+                              pr_number,
+                              "⏰ 自动跳过: 在等待时间内未通过所有检查，且无法触发 rebase，请手动处理。"
+                          )
+                  else:
+                      # checkbox 不存在或已经勾选过（Renovate 还在处理中）
+                      add_comment(
+                          pr_number,
+                          "⏰ 自动跳过: 在等待时间内未通过所有检查，"
+                          "rebase checkbox 不存在或已触发，请稍后等待 Renovate 处理或手动介入。"
+                      )
                   return
 
-              # 尝试合并PR
               if merge_pr(pr_number):
                   add_comment(pr_number, "✅ 自动合并: 小版本更新已自动合并")
               else:
@@ -206,21 +237,17 @@ jobs:
           def main():
               """主函数"""
               try:
-                  # 获取所有PR
                   prs = get_prs()
                   print(f"找到 {len(prs)} 个打开的PR")
 
-                  # 筛选Renovate的PR
                   renovate_prs = [pr for pr in prs if is_renovate_pr(pr)]
                   print(f"找到 {len(renovate_prs)} 个Renovate/Mend的PR")
 
-                  # 处理每个PR
                   for pr in renovate_prs:
                       try:
                           process_pr(pr)
                       except Exception as e:
                           print(f"处理PR #{pr['number']} 时出错: {str(e)}")
-                          # 继续处理下一个PR
 
               except Exception as e:
                   print(f"处理PR时发生错误: {str(e)}")

.github/workflows/auto_merge_renovate_prs.yml.bac

@@ -0,0 +1,231 @@
+name: Auto Process Renovate PRs
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+  workflow_dispatch:
+  schedule:
+    - cron: '0 * * * *'
+
+jobs:
+  process-renovate-prs:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: pip install requests
+
+      - name: Process Renovate PRs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          python << 'EOF'
+          import os
+          import re
+          import time
+          import requests
+          from typing import Optional, Dict, Any
+
+          # 从环境变量获取GitHub token和仓库信息
+          GITHUB_TOKEN = os.getenv('GITHUB_TOKEN')
+          REPOSITORY = os.getenv('GITHUB_REPOSITORY')
+          HEADERS = {
+              'Authorization': f'Bearer {GITHUB_TOKEN}',
+              'Accept': 'application/vnd.github.v3+json',
+              'X-GitHub-Api-Version': '2022-11-28'
+          }
+
+          def get_prs() -> list:
+              """获取所有打开的PR列表"""
+              url = f'https://api.github.com/repos/{REPOSITORY}/pulls?state=open'
+              response = requests.get(url, headers=HEADERS)
+              response.raise_for_status()
+              return response.json()
+
+          def is_renovate_pr(pr: Dict[str, Any]) -> bool:
+              """检查PR是否来自Renovate"""
+              author = pr.get('user', {}).get('login', '').lower()
+              return 'renovate' in author or 'mend' in author
+
+          def parse_version_update(pr_body: str) -> Optional[str]:
+              """解析PR正文，确定更新类型"""
+              # 匹配Markdown表格格式
+              # 示例格式:
+              # | Package | Update | Change |
+              # |---------|--------|--------|
+              # | [uusec/openresty-manager](...) | patch | `2.3.4` -> `2.3.5` |
+              
+              # 查找表格行
+              lines = pr_body.split('\n')
+              in_table = False
+              
+              for line in lines:
+                  # 检测表格开始
+                  if re.search(r'^\s*\|.*Package.*Update.*Change.*\|\s*$', line, re.IGNORECASE):
+                      in_table = True
+                      continue
+                      
+                  # 跳过表格分隔线
+                  if in_table and re.search(r'^\s*\|[-:|]+\|\s*$', line):
+                      continue
+                      
+                  # 处理表格数据行
+                  if in_table and line.strip().startswith('|'):
+                      # 提取单元格内容
+                      cells = [cell.strip() for cell in line.split('|') if cell.strip()]
+                      
+                      if len(cells) >= 3:
+                          update_type = cells[1].lower()  # 第二列是更新类型
+                          
+                          # 检查更新类型
+                          if update_type == 'major':
+                              return 'major'
+                          elif update_type in ['minor', 'patch']:
+                              return update_type
+                          
+                          # 如果没有明确类型，尝试从版本变化中推断
+                          change_cell = cells[2]  # 第三列是版本变化
+                          
+                          # 提取版本号
+                          version_pattern = r'(\d+\.\d+\.\d+|\d+\.\d+|\d+)'
+                          versions = re.findall(version_pattern, change_cell)
+                          
+                          if len(versions) >= 2:
+                              old_version = versions[0]
+                              new_version = versions[1]
+                              
+                              # 分割版本号
+                              old_parts = old_version.split('.')
+                              new_parts = new_version.split('.')
+                              
+                              if len(old_parts) > 0 and len(new_parts) > 0:
+                                  if old_parts[0] != new_parts[0]:
+                                      return 'major'
+                                  elif len(old_parts) > 1 and len(new_parts) > 1 and old_parts[1] != new_parts[1]:
+                                      return 'minor'
+                                  else:
+                                      return 'patch'
+                  elif in_table and not line.strip().startswith('|'):
+                      # 表格结束
+                      break
+              
+              return None
+
+          def is_pr_mergeable(pr_number: int) -> bool:
+              """检查PR是否可以合并"""
+              url = f'https://api.github.com/repos/{REPOSITORY}/pulls/{pr_number}'
+              response = requests.get(url, headers=HEADERS)
+              response.raise_for_status()
+              pr_data = response.json()
+              
+              # 检查合并状态
+              return pr_data.get('mergeable', False) and pr_data.get('mergeable_state', '') == 'clean'
+
+          def wait_for_checks(pr_number: int, max_wait: int = 600) -> bool:
+              """等待检查通过，最多等待max_wait秒"""
+              start_time = time.time()
+              
+              while time.time() - start_time < max_wait:
+                  if is_pr_mergeable(pr_number):
+                      return True
+                  
+                  # 等待30秒后再次检查
+                  time.sleep(30)
+              
+              return False
+
+          def merge_pr(pr_number: int) -> bool:
+              """合并PR"""
+              url = f'https://api.github.com/repos/{REPOSITORY}/pulls/{pr_number}/merge'
+              data = {
+                  'merge_method': 'merge'
+              }
+              response = requests.put(url, headers=HEADERS, json=data)
+              
+              if response.status_code == 200:
+                  print(f"成功合并PR #{pr_number}")
+                  return True
+              else:
+                  print(f"合并PR #{pr_number} 失败: {response.json().get('message', '未知错误')}")
+                  return False
+
+          def add_comment(pr_number: int, comment: str):
+              """在PR上添加评论"""
+              url = f'https://api.github.com/repos/{REPOSITORY}/issues/{pr_number}/comments'
+              data = {'body': comment}
+              response = requests.post(url, headers=HEADERS, json=data)
+              response.raise_for_status()
+
+          def process_pr(pr: Dict[str, Any]):
+              """处理单个PR"""
+              pr_number = pr['number']
+              pr_author = pr['user']['login']
+              pr_title = pr['title']
+              pr_body = pr.get('body', '')
+              
+              print(f"处理PR #{pr_number} 来自 {pr_author}: {pr_title}")
+              
+              # 解析更新类型
+              update_type = parse_version_update(pr_body)
+              
+              if not update_type:
+                  print(f"无法确定PR #{pr_number} 的更新类型，跳过")
+                  add_comment(pr_number, "⚠️ 自动处理失败: 无法确定更新类型")
+                  return
+              
+              print(f"PR #{pr_number} 更新类型: {update_type}")
+              
+              # 如果是大版本更新，跳过
+              if update_type == 'major':
+                  print(f"PR #{pr_number} 是大版本更新，跳过")
+                  add_comment(pr_number, "⏭️ 自动跳过: 大版本更新需要手动审核")
+                  return
+              
+              # 检查PR是否可以合并
+              if not wait_for_checks(pr_number):
+                  print(f"PR #{pr_number} 在等待时间内未通过检查，跳过")
+                  add_comment(pr_number, "⏰ 自动跳过: 在等待时间内未通过所有检查")
+                  return
+              
+              # 尝试合并PR
+              if merge_pr(pr_number):
+                  add_comment(pr_number, "✅ 自动合并: 小版本更新已自动合并")
+              else:
+                  add_comment(pr_number, "❌ 自动合并失败: 请手动处理")
+
+          def main():
+              """主函数"""
+              try:
+                  # 获取所有PR
+                  prs = get_prs()
+                  print(f"找到 {len(prs)} 个打开的PR")
+                  
+                  # 筛选Renovate的PR
+                  renovate_prs = [pr for pr in prs if is_renovate_pr(pr)]
+                  print(f"找到 {len(renovate_prs)} 个Renovate/Mend的PR")
+                  
+                  # 处理每个PR
+                  for pr in renovate_prs:
+                      try:
+                          process_pr(pr)
+                      except Exception as e:
+                          print(f"处理PR #{pr['number']} 时出错: {str(e)}")
+                          # 继续处理下一个PR
+                  
+              except Exception as e:
+                  print(f"处理PR时发生错误: {str(e)}")
+                  raise
+
+          if __name__ == '__main__':
+              main()
+          EOF