mirror of https://github.com/Comfy-Org/ComfyUI_frontend.git synced 2026-04-30 11:11:53 +00:00

Files

Christian Byrne 88079250eb chore: add CI safety rules to backport-management skill (#10164 )

Adds lessons learned from a bulk backport session where 69 PRs were
admin-merged without CI checks, shipping 3 test failures to core/1.41.

**Changes:**
- **SKILL.md**: CI Safety Rules section, wave verification with `pnpm
test:unit`, continuous backporting recommendation, Never Admin-Merge
Without CI lesson
- **execution.md**: Wait-for-CI step after automation, `gh pr checks
--watch` for manual cherry-picks, CI Failure Triage section with common
failure categories
- **logging.md**: Wave verification log template, CI failure report
table in session report

┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-10164-chore-add-CI-safety-rules-to-backport-management-skill-3266d73d365081aa856de1fb85a31887)
by [Unito](https://www.unito.io)

---------

Co-authored-by: GitHub Action <action@github.com>

2026-03-25 12:17:43 -07:00

3.1 KiB

Raw Blame History

Logging & Session Reports

During Execution

Maintain execution-log.md with per-branch tables:

| PR#   | Title | CI Status                      | Status                            | Backport PR | Notes   |
| ----- | ----- | ------------------------------ | --------------------------------- | ----------- | ------- |
| #XXXX | Title | ✅ Pass / ❌ Fail / ⏳ Pending | ✅ Merged / ⏭️ Skip / ⏸️ Deferred | #YYYY       | Details |

Wave Verification Log

Track verification results per wave:

## Wave N Verification — TARGET_BRANCH

- PRs merged: #A, #B, #C
- Typecheck: ✅ Pass / ❌ Fail
- Unit tests: ✅ Pass / ❌ Fail
- Issues found: (if any)
- Human review needed: (list any non-trivial conflict resolutions)

Session Report Template

# Backport Session Report

## Summary

| Branch | Candidates | Merged | Skipped | Deferred | Rate |
| ------ | ---------- | ------ | ------- | -------- | ---- |

## Deferred Items (Needs Human)

| PR# | Title | Branch | Issue |

## Conflict Resolutions Requiring Review

| PR# | Branch | Conflict Type | Resolution Summary |

## CI Failure Report

| PR# | Branch | Failing Check | Error Summary | Cause | Resolution |
| --- | ------ | ------------- | ------------- | ----- | ---------- |

## Automation Performance

| Metric                      | Value |
| --------------------------- | ----- |
| Auto success rate           | X%    |
| Manual resolution rate      | X%    |
| Overall clean rate          | X%    |
| Wave verification pass rate | X%    |

## Process Recommendations

- Were there clusters of related PRs that should have been backported together?
- Any PRs that should have been backported sooner (continuous backporting candidates)?
- Feature branches that need tracking for future sessions?

Final Deliverable: Visual Summary

At session end, generate a mermaid diagram showing all backported PRs organized by target branch and category (MUST/SHOULD), plus a summary table. Present this to the user as the final output.

graph TD
    subgraph branch1["☁️ cloud/X.XX — N PRs"]
        C1["#XXXX title"]
        C2["#XXXX title"]
    end

    subgraph branch2must["🔴 core/X.XX MUST — N PRs"]
        M1["#XXXX title"]
    end

    subgraph branch2should["🟡 core/X.XX SHOULD — N PRs"]
        S1["#XXXX-#XXXX N auto-merged"]
        S2["#XXXX-#XXXX N manual picks"]
    end

    classDef cloudStyle fill:#1a3a5c,stroke:#4da6ff,color:#e0f0ff
    classDef coreStyle fill:#1a4a2e,stroke:#4dff88,color:#e0ffe8
    classDef mustStyle fill:#5c1a1a,stroke:#ff4d4d,color:#ffe0e0
    classDef shouldStyle fill:#4a3a1a,stroke:#ffcc4d,color:#fff5e0

Use the mermaid tool to render this diagram and present it alongside the summary table as the session's final deliverable.

Files to Track

candidate_list.md — all candidates per branch
decisions.md — MUST/SHOULD/SKIP with rationale
wave-plan.md — execution order
execution-log.md — real-time status
backport-session-report.md — final summary

All in ~/temp/backport-session/.

3.1 KiB Raw Blame History