From f0e2dd39d359626ee8d970cb9c36a5b9b38bbc65 Mon Sep 17 00:00:00 2001
From: andig <andi@evcc.io>
Date: Sun, 16 Aug 2026 11:20:28 +0200
Subject: [PATCH] chore: fix release notes changelog template (#32877)

---
 .github/workflows/command-backport.yml | 9 +++------
 .goreleaser.yml                        | 2 --
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/command-backport.yml b/.github/workflows/command-backport.yml
index 3c6d8139f..138a8836a 100644
--- a/.github/workflows/command-backport.yml
+++ b/.github/workflows/command-backport.yml
@@ -157,18 +157,15 @@ jobs:
           TITLE: ${{ steps.pr.outputs.title }}
           ACTOR: ${{ github.event.comment.user.login }}
         run: |
-          # the release line the branch was cut from, 0.313 for release/0.313.1
-          line=$(echo "${TARGET#release/}" | cut -d. -f1,2)
-
           # the pull request is authored by the deploy token, so assign the
           # requester. the body stays empty, squashing it would carry the text
           # into the release branch as the commit description.
-          # the marker trails the title so the changelog filters and groups still
-          # see the original prefix, goreleaser strips it from the release notes
+          # the title stays untouched so the changelog filters and groups still
+          # see the original prefix, the backport label identifies the pull request
           url=$(gh pr create \
             --base "$TARGET" \
             --head "$BRANCH" \
-            --title "$TITLE [$line backport]" \
+            --title "$TITLE" \
             --label backport \
             --assignee "$ACTOR" \
             --body "")
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 6e8727589..ff4d59c91 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -71,8 +71,6 @@ snapshot:
 
 changelog:
   sort: asc
-  # drop the marker the backport command appends to the pull request title
-  format: '{{ .SHA }} {{ reReplaceAll ` \[\d+\.\d+ backport\]` .Message "" }}'
   filters:
     exclude:
       - "^chore"