From 494144a7c7725944c8bd2711eef2a5231f542a4f Mon Sep 17 00:00:00 2001 From: purian23 Date: Fri, 10 Jul 2026 11:09:05 -0400 Subject: [PATCH] workflow: updated target extraction regex options --- .github/workflows/port.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/port.yml b/.github/workflows/port.yml index 563d34e2a..ef11d4275 100644 --- a/.github/workflows/port.yml +++ b/.github/workflows/port.yml @@ -1,7 +1,8 @@ name: Port to release branch # Ports flagged commits from master onto release/X.Y branches: -# - "Port: 1.5" (or "Port/1.5") trailer line in a commit message pushed to master +# - trailer line in a commit message pushed to master; accepted forms: +# "Port: 1.5", "Port/1.5", "Port 1.5", "Port - 1.5", "Port: release/1.5" # - "port release/1.5" label on a merged PR # Conflicts are reported to the "Port status: " tracking issue. @@ -54,9 +55,11 @@ jobs: # skip merge commits (handled by the label path) [ "$(git rev-list --no-walk --count --min-parents=2 "$sha")" -eq 0 ] || continue + # extract targets, then keep only version-shaped ones (X.Y[.Z]) targets=$(git log -1 --format=%B "$sha" | - { grep -iE '^Port[:/]' || true; } | sed 's|^port[:/] *||I' | tr ',' '\n' | - sed 's/[[:space:]]//g; /^$/d' | sed 's|^release/||I' | sort -u) + { grep -iE '^Port[:/ -]' || true; } | sed -E 's|^port[-:/ ]+||I' | tr ',' '\n' | + sed 's/[[:space:]]//g; /^$/d' | sed 's|^release/||I' | + { grep -E '^[0-9]+\.[0-9]+(\.[0-9]+)?$' || true; } | sort -u) for ver in $targets; do echo "::group::port $sha -> release/$ver" bash scripts/port.sh "release/$ver" "$sha"