如何基于特定提交消息触发GitHub Actions自动合并main到prod分支？

用户问题 #

我们有main和prod两个网站构建基准分支，希望通过工作流实现：当main分支的提交消息符合特定规则时，自动将main合并到prod。尝试了多种方法但遇到合并冲突，本地执行相同命令也无法解决，以下是当前的工作流代码：

name: "Merge main into prod"

on:
  push:
    branches:
      - main

jobs:
  merge-main-into-prod:
    name: "Merge main into prod "
    runs-on: ubuntu-latest
    steps:
      - name: "Checkout main branch"
        uses: actions/checkout@v3
        with:
          ref: main
      
      - name: "Set up Git user"
        run: |
          git config user.name "GitHub Action"
          git config user.email "action@github.com"
    
      - name: "Get last commit message"
        id: get_message
        run: |
          last_commit_message=$(git log -1 --pretty=format:%s)
          echo "Last commit message: $last_commit_message"
          echo "message=$last_commit_message" >> $GITHUB_ENV

      - name: "Check commit message pattern"
        id: check_pattern
        run: |
          if echo "${{ env.message }}" | grep -qE '^Merge pull request #[0-9]+ from *****/cms/Changelog/index$'; then
            echo "Pattern matched"
            echo "match=true" >> $GITHUB_ENV
          else
            echo "Pattern did not match"
            echo "match=false" >> $GITHUB_ENV
          fi

      - name: "Checkout prod branch"
        if: env.match == 'true'
        uses: actions/checkout@v3
        with:
          ref: prod
      
      - name: "Fetch main branch"
        if: env.match == 'true'
        run: |
          git fetch origin main:main
    
      - name: "Merge main into prod"
        if: env.match == 'true'
        run: |
          git merge main --no-ff --allow-unrelated-histories -m "Merging changes from main to prod"
          git push origin prod

解决方案 #

1. 现有工作流的核心问题 #

• 重复切换分支会破坏Git上下文：先拉取main再切换prod，会丢失之前的配置和历史信息，导致合并逻辑异常
• 提交消息检查步骤冗余：可以直接在工作流触发阶段完成过滤，减少不必要的任务执行
• 未处理合并冲突的异常场景：冲突发生后没有 fallback 逻辑，导致工作流直接失败无反馈

2. 优化后的工作流代码 #

name: "自动合并main到prod"

on:
  push:
    branches:
      - main
    # 直接在触发阶段匹配提交消息，提前过滤不符合规则的提交
    if: ${{ startsWith(github.event.head_commit.message, 'Merge pull request #') && endsWith(github.event.head_commit.message, 'from *****/cms/Changelog/index') }}

jobs:
  merge-main-to-prod:
    runs-on: ubuntu-latest
    steps:
      - name: 拉取完整仓库代码
        uses: actions/checkout@v4
        with:
          fetch-depth: 0 # 拉取完整Git历史，避免合并时历史缺失

      - name: 配置Git用户信息
        run: |
          git config user.name "GitHub Action"
          git config user.email "action@github.com"

      - name: 切换到prod分支并拉取最新代码
        run: |
          git checkout prod
          git pull origin prod --rebase

      - name: 尝试合并main到prod
        run: |
          git merge origin/main --no-ff -m "自动合并main到prod: ${{ github.sha }}"
          git push origin prod
        # 合并失败不终止工作流，执行后续通知步骤
        continue-on-error: true

      - name: 合并冲突通知
        if: failure()
        run: |
          echo "⚠️ 合并main到prod时出现冲突，请手动处理后再合并"
          # 可扩展：添加Slack/企业微信等通知逻辑，提醒相关人员介入

3. 冲突处理建议 #

• 若冲突无法避免，必须保留人工介入环节：自动合并仅适用于无冲突的场景，复杂冲突需要开发人员手动解决
• 定期同步prod与main分支：减少长期代码差异导致的大规模冲突
• 确保main分支代码稳定性：仅将经过测试、确认可发布的代码合并到main，降低prod分支的合并风险

内容的提问来源于stack exchange，提问作者Savutro