Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions app/core/github/webhook.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,26 +92,40 @@ def find_matching_webhook(

Args:
repo_name: 仓库名
branch: 分支名
branch: 分支名 (可能为空,对于非push事件)
event_type: 事件类型
webhooks: webhook 配置列表

Returns:
匹配的 webhook 配置或 None
"""
logger.debug("尝试匹配 webhook: 仓库=%s, 分支=%s, 事件类型=%s", repo_name, branch, event_type)

for webhook in webhooks:
# 检查仓库名是否匹配配置中的任一模式
repo_matches = any(match_pattern(repo_name, repo_pattern)
for repo_pattern in webhook.REPO)

# 检查分支名是否匹配配置中的任一模式
branch_matches = any(match_pattern(branch, branch_pattern)
for branch_pattern in webhook.BRANCH)

# 检查事件类型是否匹配
if (repo_matches and branch_matches and event_type in webhook.EVENTS):
return webhook

for repo_pattern in webhook.REPO)
if not repo_matches:
continue

if event_type not in webhook.EVENTS:
continue

if event_type in ["push", "pull_request"]:
branch_matches = any(match_pattern(branch, branch_pattern)
for branch_pattern in webhook.BRANCH)
if not branch_matches:
continue
else:
if getattr(webhook, "BRANCH_CHECK_ALL", False) and branch:
branch_matches = any(match_pattern(branch, branch_pattern)
for branch_pattern in webhook.BRANCH)
if not branch_matches:
continue

logger.debug("找到匹配的webhook配置: %s", webhook)
return webhook

logger.debug("未找到匹配的webhook配置")
return None

@staticmethod
Expand Down