Agent Skills › dartsim/dart › dart-release-merge-main

dart-release-merge-main

GitHub

用于将 DART 活动发布分支合并回 main 分支。自动检测版本，处理冲突并执行 lint 检查，在获得批准前不推送，最终创建指向 main 的 PR 并监控 CI 状态。

.codex/skills/dart-release-merge-main/SKILL.md dartsim/dart

触发场景

需要将发布分支代码合并到主开发分支执行 DART 项目的标准发布合并流程

安装

npx skills add dartsim/dart --skill dart-release-merge-main -g -y

更多选项

非标准路径

npx skills add https://github.com/dartsim/dart/tree/main/.codex/skills/dart-release-merge-main -g -y

不安装直接使用

npx skills use dartsim/dart@dart-release-merge-main

指定 Agent (Claude Code)

npx skills add dartsim/dart --skill dart-release-merge-main -a claude-code -g -y

安装 repo 全部 skill

npx skills add dartsim/dart --all -g -y

预览 repo 内 skill

npx skills add dartsim/dart --list

SKILL.md

Frontmatter

{
    "name": "dart-release-merge-main",
    "description": "DART Release Merge Main: merge the active release branch back into main"
}

dart-release-merge-main

Use this skill in Codex to run the DART dart-release-merge-main workflow. The editable workflow source currently lives in .claude/commands/, and this generated Codex skill is a generated Codex adapter entrypoint.

Invocation

Claude Code/OpenCode: /dart-release-merge-main <arguments>
Codex: $dart-release-merge-main <arguments>

Treat the text after the skill name as $ARGUMENTS. When the workflow references $1, $2, etc., map those to the positional values supplied by the user.

Command Body

Merge release branch into main: $ARGUMENTS

Required Reading

@AGENTS.md @docs/onboarding/release-management.md @docs/onboarding/ci-cd.md

Workflow

Auto-detect or confirm the active release branch and release version:

git fetch origin
git branch -r | grep -oE 'origin/release-[0-9]+\.[0-9]+' | sort -V | tail -1

Verify the clone is not shallow and a merge base exists.
Create merge/<release-branch>-into-main from origin/main.
Merge the release branch with a title like Merge release-6.19 into main (v6.19.x).
Resolve conflicts using docs/onboarding/release-management.md:
- deleted in main, updated in release: keep deleted
- added in both: prefer main unless release has unique needed content
- content conflicts: prefer main modernization except for manually reviewed changelog entries
- files only on release: keep if still relevant to main
Verify no unresolved conflicts remain.
Run pixi run lint and relevant checks.
Ask for explicit maintainer/user approval before pushing or creating the PR. After approval, create a PR targeting main with milestone DART 7.0 and use the PR template.
Monitor CI until green.

Output

PR URL and CI status
Release branch and release version
Conflict counts and resolution summary
Any manual changelog decisions

版本历史

51b2d25 当前 2026-07-11 18:26
更新描述文本，将生成的 Codex skill 定义从 'first-class Codex entrypoint' 修正为 'generated Codex adapter entrypoint'，以准确反映其作为适配器入口的性质。
e0d13fd 2026-07-05 10:38