Skip to content

Commit fd1ff59

Browse files
mushuiyu886mushuiyu886
authored
Merge branch 'main' into feat/issue-100368
2 parents 3acef2b + dfa31af commit fd1ff59

1,047 files changed

Lines changed: 65712 additions & 11043 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.agents/skills/openclaw-changelog-update/SKILL.md‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ every human `Thanks @...` attribution.
2626
an explicit shipped/main-closeout SHA only when it is also reachable from the
2727
target.
2828
- Target ref: exact branch/SHA being released.
29+
- Canonical main ref: current `origin/main`, fetched before verification. Release
30+
notes cite the original merged main PR when the same work is carried by a
31+
backport. A release-branch PR is used only while no forward-port exists on
32+
current main.
2933

3034
## Workflow
3135

@@ -44,6 +48,7 @@ every human `Thanks @...` attribution.
4448
node .agents/skills/openclaw-changelog-update/scripts/verify-release-notes.mjs \
4549
--base <base-tag> \
4650
--target <target-ref> \
51+
--main-ref origin/main \
4752
--version <YYYY.M.PATCH> \
4853
--manifest /tmp/openclaw-release-<YYYY.M.PATCH>.json \
4954
--write-ledger
@@ -53,9 +58,8 @@ every human `Thanks @...` attribution.
5358
exact base/target SHA snapshot under the worktree's git metadata. Iterative
5459
rewrites at the same target avoid repeated network discovery. Use
5560
`--refresh-github-snapshot` after suspect API data, `--github-snapshot
56-
<path>` for an explicit artifact, or `--no-github-snapshot` for a live-only
61+
<path>` for an explicit artifact, or `--no-github-snapshot` for a live-only
5762
audit. GitHub release bodies are always read live.
58-
5963
- the manifest is the required input to the rewrite, not an after-the-fact
6064
audit; it contains every referenced PR, eligible contributor credit,
6165
inline issue context, every direct commit, and an editorial-eligibility
@@ -78,6 +82,12 @@ every human `Thanks @...` attribution.
7882
PR references explicitly present in active commit subjects/bodies so
7983
cherry-picks and squash commits remain accounted for. Resolve every
8084
association page and exclude PRs merged after the target release commit
85+
- canonicalize backports to the original merged PR on `main`: explicit
86+
cherry-pick origins win, then a unique normalized-subject match requires
87+
the same author and an overlapping changed path. Suppress release/backport
88+
PRs whenever the corresponding main PR exists on current `origin/main`.
89+
Keep a release-branch PR only when that change landed there first and has
90+
not yet been forward-ported to `main`
8191
- read the manifest before editing `### Highlights`, `### Changes`, or
8292
`### Fixes`; do not carry old grouped prose forward without re-auditing it
8393
- inspect linked PRs/issues or diffs for ambiguous commits. Direct commits
@@ -175,6 +185,7 @@ every human `Thanks @...` attribution.
175185
node .agents/skills/openclaw-changelog-update/scripts/verify-release-notes.mjs \
176186
--base <base-tag> \
177187
--target <target-ref> \
188+
--main-ref origin/main \
178189
--version <YYYY.M.PATCH> \
179190
--manifest /tmp/openclaw-release-<YYYY.M.PATCH>.json \
180191
--write-ledger

0 commit comments

Comments
 (0)