Skip to content

chore(chloggen): backport changelog tooling to release-v3.0 - #7372

Merged
zhxiaogg merged 6 commits into
grafana:release-v3.0from
zhxiaogg:backport-chloggen-to-release-v3.0
Jun 3, 2026
Merged

chore(chloggen): backport changelog tooling to release-v3.0#7372
zhxiaogg merged 6 commits into
grafana:release-v3.0from
zhxiaogg:backport-chloggen-to-release-v3.0

Conversation

@zhxiaogg

@zhxiaogg zhxiaogg commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

Backports the changelog-tooling (chloggen) work to release-v3.0.

Cherry-picked PRs (in order)

  1. chore(tools): add chloggen for changelog management #7346 — chore(tools): add chloggen for changelog management (the in-tree fork)
  2. chore(tools): configurable chloggen change types and required entry author #7351 — chore(tools): configurable chloggen change types and required entry author
  3. chore: adopt chloggen for changelog management #7339 — chore: adopt chloggen for changelog management
  4. chore: update changelog check to include modified files #7366 — chore: update changelog check to include modified files
  5. chore(chloggen): branch-name default, optional auto-filled PR, type/docs skip #7368 — chore(chloggen): branch-name default, optional auto-filled PR, type/docs skip

Backport adaptations

  • Dropped the 28 .chloggen/_migrated_*.yaml files introduced by chore: adopt chloggen for changelog management #7339. Those captured main's post-v3.0.0 unreleased entries; none of those PRs are in release-v3.0's history, so they don't belong here.
  • CHANGELOG.md: release-v3.0's ## main / unreleased section was empty, so it's simply replaced with the <!-- next version --> marker (no entries to migrate).
  • changelog workflow (.github/workflows/changelog.yml): retargeted from main to release-v3.0 (PR trigger branch + git merge-base base) so the check runs on backport PRs to this branch. Added as a separate adaptation commit.

Verification

  • make chlog-validate passes; go test ./... in tools/chloggen is green.
@zhxiaogg
zhxiaogg force-pushed the backport-chloggen-to-release-v3.0 branch from 139da56 to ada784b Compare June 3, 2026 18:19
Backport adaptation: the changelog workflow introduced in grafana#7339 only runs
for PRs targeting main and uses origin/main as the diff base. Point both at
release-v3.0 so the check runs on backport PRs to this branch.
@zhxiaogg
zhxiaogg merged commit e4b3a7a into grafana:release-v3.0 Jun 3, 2026
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants