Skip to content

Commit dc27e1f

Browse files
IvanHuntersIvanHunters
committed
chore(ci): complete the backport label rename across all consumers
The initial rename missed several literal consumers of the old label names beyond labels.yml and backport.yaml: - stale.yaml exempt-pr-labels still listed backport,backport-previous. actions/stale matches label names exactly and does not resolve label-sync aliases, so after the rename a kind/backport PR would lose its stale exemption and get auto-closed after inactivity. This is the one behavioural regression; the rest are documentation drift. - PULL_REQUEST_TEMPLATE.md told contributors to apply the backport label. - release.md label-target table and the gh pr list --search commands referenced the old names (the searches would silently return nothing). - contributing.md claimed a backport label is auto-applied on the [Backport] prefix; pr-labeler only adds area/release, so the line was already stale and is corrected while renaming. Historical narrative in release.md and the backport scope-to-area doc rows (a Conventional-Commit scope, not the label) are left as-is. Signed-off-by: IvanHunters <[email protected]>
1 parent f7f3789 commit dc27e1f

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
- Breaking changes: append `!` after type/scope (`feat(api)!: ...`) or add a `BREAKING CHANGE:` footer
99
- If it's a work in progress, consider creating this PR as a draft.
1010
- Don't hesistate to ask for opinion and review in the community chats, even if it's still a draft.
11-
- Add the label `backport` if it's a bugfix that needs to be backported to a previous version.
11+
- Add the label `kind/backport` if it's a bugfix that needs to be backported to a previous version.
1212
-->
1313

1414
## What this PR does

‎.github/workflows/stale.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
triage/accepted,kind/regression
4040
exempt-pr-labels: >-
4141
lifecycle/frozen,do-not-merge/hold,
42-
backport,backport-previous
42+
kind/backport,kind/backport-previous
4343
days-before-stale: 60
4444
days-before-close: 14
4545
operations-per-run: 100

‎docs/agents/contributing.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ git commit --signoff -m "docs(contributing): add installation guide"
105105

106106
**Special handling:**
107107

108-
- `[Backport release-1.x]` prefix is stripped before parsing; `area/release` and `backport` labels are added.
108+
- `[Backport release-1.x]` prefix is stripped before parsing; the `area/release` label is added.
109109
- Composite scope (`feat(platform, system, apps): ...`) — each comma-separated part is mapped independently.
110110
- `!` after type or `BREAKING CHANGE:` footer in the body → `kind/breaking-change`.
111111
- Unmapped scope or non-conventional title → `area/uncategorized` (signals the PR needs manual area selection).

‎docs/release.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ The matching Talos node image is `ghcr.io/cozystack/cozystack/cozystack-nocloud:
282282

283283
| Label | Target branch |
284284
|-------|---------------|
285-
| `backport` | `release-X.Y` (current latest minor) |
286-
| `backport-previous` | `release-X.(Y-1)` |
285+
| `kind/backport` | `release-X.Y` (current latest minor) |
286+
| `kind/backport-previous` | `release-X.(Y-1)` |
287287

288288
Resolution is dynamic via `getLatestRelease` at run time — no need to hardcode branch names.
289289

@@ -309,7 +309,7 @@ git push origin release-X.Y # or push to a new branch and open a PR
309309
To find the bot's failed comments across a batch of PRs:
310310

311311
```bash
312-
for n in $(gh pr list --search "label:backport label:backport-previous merged:>=2026-01-01" --json number --jq '.[].number'); do
312+
for n in $(gh pr list --search "label:kind/backport label:kind/backport-previous merged:>=2026-01-01" --json number --jq '.[].number'); do
313313
echo "=== #$n ==="
314314
gh pr view $n --json comments --jq '.comments[] | select(.author.login == "github-actions" or (.author.login | contains("backport"))) | .body' | head -20
315315
done
@@ -321,8 +321,8 @@ A patch release includes bugfixes for code that shipped in the corresponding min
321321

322322
```bash
323323
# 1. Inventory PRs already labeled for backport (merged but not yet on release-X.Y)
324-
gh pr list --search "is:merged label:backport" --limit 100
325-
gh pr list --search "is:merged label:backport-previous" --limit 100
324+
gh pr list --search "is:merged label:kind/backport" --limit 100
325+
gh pr list --search "is:merged label:kind/backport-previous" --limit 100
326326

327327
# 2. List commits on main since the release branch diverged that are NOT yet on release-X.Y
328328
git merge-base origin/main origin/release-X.Y

0 commit comments

Comments
 (0)