🔀 解决合并冲突 · readme-auto-update-on-merge.yml · 采用main的健壮retry逻辑

Co-authored-by: qinfendebingshuo <207279273+qinfendebingshuo@users.noreply.github.com>
2026-04-11 07:26:14 +00:00 · 2026-04-11 07:26:14 +00:00 · 85c47509c0
parent 21c01e5a4d 41a24a2456
commit 85c47509c0
7 changed files with 80 additions and 47 deletions
--- a/.github/workflows/readme-auto-update-on-merge.yml
+++ b/.github/workflows/readme-auto-update-on-merge.yml
@ -37,13 +37,19 @@ on:
 permissions:
  contents: write

+# 防止并发运行：同一时间只允许一个实例，后触发的排队等待
+concurrency:
+  group: readme-auto-update
+  cancel-in-progress: false
+
 jobs:
  update-readme:
    # 只在PR被合并时运行（不是关闭未合并），或push/手动触发
+    # push 事件排除 [skip ci] 提交（防止自身触发循环）
    if: >
-      github.event_name == 'push' ||
      github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
+      (github.event_name == 'pull_request' && github.event.pull_request.merged == true) ||
+      (github.event_name == 'push' && !contains(github.event.head_commit.message, '[skip ci]'))
    runs-on: ubuntu-latest
    timeout-minutes: 10

@ -101,12 +107,25 @@ jobs:
              MSG="📡 README自动更新 · 手动触发 · $(TZ='Asia/Shanghai' date '+%Y-%m-%d %H:%M')"
            fi
            git commit -m "$MSG [skip ci]"
+
+            # 推送前拉取远程变更，最多重试3次
            for i in 1 2 3; do
-              git pull --rebase origin main && git push && break
-              echo "⚠️ 推送冲突，第${i}次重试..."
-              sleep $((i * 2))
+              if ! git pull --rebase origin main; then
+                echo "⚠️ rebase 失败，尝试中止并重建提交..."
+                git rebase --abort 2>/dev/null || true
+                git pull --rebase origin main 2>/dev/null || true
+              fi
+              if git push; then
+                echo "✅ README变更已提交并推送 (第${i}次尝试)"
+                break
+              fi
+              if [ "$i" -eq 3 ]; then
+                echo "⚠️ 推送失败3次，跳过本次更新（下次触发时会重试）"
+                exit 0
+              fi
+              echo "⚠️ 推送失败，${i}秒后重试..."
+              sleep "$i"
            done
-            echo "✅ README变更已提交并推送"
          else
            echo "ℹ️ 无变更需要提交"
          fi
--- a/README.md
+++ b/README.md
@ -288,7 +288,7 @@ S1(✅) → S2(✅) → S4(✅) → S5(✅) → S15(✅) → 模块A-H(✅) →

 ## 📡 铸渊副将·每日签到仪表盘

-> ⏰ **仪表盘更新时间**: 2026-04-11 12:04:44 (北京时间)
+> ⏰ **仪表盘更新时间**: 2026-04-11 14:49:07 (北京时间)
 > 🎖️ **唤醒时段**: ⚡ 手动唤醒
 > 📊 **系统版本**: awakened · 第五十八次对话 · D58·铸渊专线2.0正式启用·V1节点停用·共享流量池2000GB/月·无论多少用户总量一致·每月1号重置·多用户隔离确认·VPN是算力人格体第一个实战场景
 > ✅ **士兵存活**: 18/18 个工作流在岗
--- a/data/aoac/chain-report.json
+++ b/data/aoac/chain-report.json
@ -1,18 +1,18 @@
 {
  "aoac_agent": "AOAC-03",
  "aoac_agent_name": "dev-chain-agent",
-  "report_id": "AOAC-CHAIN-20260411-305",
+  "report_id": "AOAC-CHAIN-20260411-905",
  "status": "complete",
-  "timestamp": "2026-04-11 14:36:33+08:00",
-  "timestamp_utc": "2026-04-11T06:36:33.189Z",
+  "timestamp": "2026-04-11 14:49:16+08:00",
+  "timestamp_utc": "2026-04-11T06:49:16.258Z",
  "fusion": {
    "dev_sentinel": "missing",
    "merge_sentinel": "present",
    "fusion_quality": "partial"
  },
  "development": {
-    "pr_number": 334,
-    "pr_title": "🔗 AOAC Agent Chain v1.0 · 环环相扣Agent链路闭环系统",
+    "pr_number": 335,
+    "pr_title": "fix: README auto-update workflow concurrent push race condition",
    "author": "",
    "branch": "",
    "files_changed": 0,
@ -24,7 +24,7 @@
    "overall": "failure",
    "passed": 0,
    "failed": 0,
-    "merge_commit": "3cfa1b8675874d6051d741ae390652a6bc19f6ff"
+    "merge_commit": "808379f2c8777fba375c9ca083782935b3c72c3c"
  },
  "changes_summary": "CI: failure (✅0 ❌0)",
  "triggered_by": "AOAC-02",
--- a/data/aoac/chain-status.json
+++ b/data/aoac/chain-status.json
@ -19,7 +19,7 @@
      "name": "action-merge-sentinel",
      "name_cn": "合并哨兵",
      "status": "half_ready",
-      "last_run": "2026-04-11T06:36:24.019Z",
+      "last_run": "2026-04-11T06:49:06.317Z",
      "last_success": null,
      "trigger": "pull_request.closed+merged"
    },
@ -27,8 +27,8 @@
      "name": "dev-chain-agent",
      "name_cn": "开发全链路Agent",
      "status": "completed",
-      "last_run": "2026-04-11T06:36:33.189Z",
-      "last_success": "2026-04-11T06:36:33.189Z",
+      "last_run": "2026-04-11T06:49:16.258Z",
+      "last_success": "2026-04-11T06:49:16.258Z",
      "trigger": "AOAC-02.completed"
    },
    "AOAC-04": {
--- a/data/aoac/history/2026-04-11/AOAC-CHAIN-20260411-905.json
+++ b/data/aoac/history/2026-04-11/AOAC-CHAIN-20260411-905.json
@ -0,0 +1,32 @@
+{
+  "aoac_agent": "AOAC-03",
+  "aoac_agent_name": "dev-chain-agent",
+  "report_id": "AOAC-CHAIN-20260411-905",
+  "status": "complete",
+  "timestamp": "2026-04-11 14:49:16+08:00",
+  "timestamp_utc": "2026-04-11T06:49:16.258Z",
+  "fusion": {
+    "dev_sentinel": "missing",
+    "merge_sentinel": "present",
+    "fusion_quality": "partial"
+  },
+  "development": {
+    "pr_number": 335,
+    "pr_title": "fix: README auto-update workflow concurrent push race condition",
+    "author": "",
+    "branch": "",
+    "files_changed": 0,
+    "additions": 0,
+    "deletions": 0,
+    "categories": {}
+  },
+  "ci_result": {
+    "overall": "failure",
+    "passed": 0,
+    "failed": 0,
+    "merge_commit": "808379f2c8777fba375c9ca083782935b3c72c3c"
+  },
+  "changes_summary": "CI: failure (✅0 ❌0)",
+  "triggered_by": "AOAC-02",
+  "triggers_next": "AOAC-04 (readme-sync-module)"
+}
--- a/data/aoac/merge-result-log.json
+++ b/data/aoac/merge-result-log.json
@ -2,39 +2,30 @@
  "aoac_agent": "AOAC-02",
  "aoac_agent_name": "action-merge-sentinel",
  "status": "half_ready",
-  "timestamp": "2026-04-11 14:36:24+08:00",
-  "timestamp_utc": "2026-04-11T06:36:24.018Z",
+  "timestamp": "2026-04-11 14:49:06+08:00",
+  "timestamp_utc": "2026-04-11T06:49:06.316Z",
  "merge": {
-    "pr_number": 334,
-    "pr_title": "🔗 AOAC Agent Chain v1.0 · 环环相扣Agent链路闭环系统",
-    "merge_commit_sha": "3cfa1b8675874d6051d741ae390652a6bc19f6ff",
-    "head_sha": "9467249d21d5f7769167a1571bc53c63d34acf5a",
+    "pr_number": 335,
+    "pr_title": "fix: README auto-update workflow concurrent push race condition",
+    "merge_commit_sha": "808379f2c8777fba375c9ca083782935b3c72c3c",
+    "head_sha": "d96389fcd0806599c5e30bb6c01b9d939e43da4a",
    "base_branch": "main"
  },
  "ci": {
    "combined_status": "failure",
    "overall_result": "failure",
    "summary": {
-      "total": 4,
+      "total": 2,
      "passed": 0,
      "failed": 0,
-      "skipped": 1
+      "skipped": 0
    },
    "check_runs": [
-      {
-        "name": "gate-guard",
-        "status": "completed",
-        "conclusion": "skipped",
-        "started_at": "2026-04-11T06:36:17Z",
-        "completed_at": "2026-04-11T06:36:16Z",
-        "output_title": null,
-        "output_summary": ""
-      },
      {
        "name": "build",
        "status": "in_progress",
        "conclusion": null,
-        "started_at": "2026-04-11T06:36:21Z",
+        "started_at": "2026-04-11T06:49:03Z",
        "completed_at": null,
        "output_title": null,
        "output_summary": ""
@ -43,16 +34,7 @@
        "name": "📡 Bridge E · GitHub Changes → Notion",
        "status": "in_progress",
        "conclusion": null,
-        "started_at": "2026-04-11T06:36:20Z",
-        "completed_at": null,
-        "output_title": null,
-        "output_summary": ""
-      },
-      {
-        "name": "update-readme",
-        "status": "in_progress",
-        "conclusion": null,
-        "started_at": "2026-04-11T06:36:20Z",
+        "started_at": "2026-04-11T06:49:02Z",
        "completed_at": null,
        "output_title": null,
        "output_summary": ""
--- a/data/aoac/readme-sync-trigger.json
+++ b/data/aoac/readme-sync-trigger.json
@ -1,8 +1,8 @@
 {
-  "trigger_id": "AOAC-TRIGGER-20260411-305",
+  "trigger_id": "AOAC-TRIGGER-20260411-905",
  "source": "AOAC-03",
  "target": "AOAC-04",
-  "chain_report_id": "AOAC-CHAIN-20260411-305",
-  "timestamp": "2026-04-11T06:36:33.189Z",
+  "chain_report_id": "AOAC-CHAIN-20260411-905",
+  "timestamp": "2026-04-11T06:49:16.258Z",
  "action": "readme_sync"
 }