From cb0dc9c68dce0cc88e1ecc499dba422179dcb1e2 Mon Sep 17 00:00:00 2001
From: purian23 <purian23@gmail.com>
Date: Thu, 9 Jul 2026 12:02:14 -0400
Subject: [PATCH] workflow: update porting logic

---
 .github/workflows/dms-stable.yml | 5 +++++
 .github/workflows/port.yml       | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dms-stable.yml b/.github/workflows/dms-stable.yml
index 2c26923a8..63bb76ba6 100644
--- a/.github/workflows/dms-stable.yml
+++ b/.github/workflows/dms-stable.yml
@@ -7,6 +7,7 @@ on:
 
 permissions:
   contents: write
+  issues: write
 
 jobs:
   update-stable:
@@ -77,3 +78,7 @@ jobs:
           fi
           git push "https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git" "HEAD:refs/heads/${branch}"
           echo "created ${branch} at ${GITHUB_REF_NAME}"
+          GH_TOKEN="${{ secrets.GITHUB_TOKEN }}" gh label create "port ${branch}" \
+            --repo "${{ github.repository }}" \
+            --description "Auto-port merged PR to ${branch}" --color 0e8a16 ||
+            echo "label 'port ${branch}' may already exist"
diff --git a/.github/workflows/port.yml b/.github/workflows/port.yml
index a503c15da..e74aaf11f 100644
--- a/.github/workflows/port.yml
+++ b/.github/workflows/port.yml
@@ -1,7 +1,7 @@
 name: Port to release branch
 
 # Ports flagged commits from master onto release/X.Y branches:
-#   - "Port: 1.5" trailer in a commit message pushed to master
+#   - "Port: 1.5" (or "Port/1.5") trailer line in a commit message pushed to master
 #   - "port release/1.5" label on a merged PR
 # Conflicts are reported to the "Port status: <branch>" tracking issue.
 
@@ -52,7 +52,7 @@ jobs:
             [ "$(git rev-list --no-walk --count --min-parents=2 "$sha")" -eq 0 ] || continue
 
             targets=$(git log -1 --format=%B "$sha" |
-              { grep -iE '^Port:' || true; } | sed 's/^port: *//I' | tr ',' '\n' |
+              { grep -iE '^Port[:/]' || true; } | sed 's|^port[:/] *||I' | tr ',' '\n' |
               sed 's/[[:space:]]//g; /^$/d' | sed 's|^release/||I' | sort -u)
             for ver in $targets; do
               echo "::group::port $sha -> release/$ver"