Skip to content

Commit daba2ad

Browse files
committed
Fix
1 parent 348a563 commit daba2ad

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

.github/workflows/prepare-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,4 @@ jobs:
8383
labels: |
8484
release
8585
automated
86+
delete-branch: true

.github/workflows/release.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ jobs:
2222
version:
2323
name: Determine Version
2424
runs-on: ubuntu-latest
25+
# Gate: manual dispatch OR merged PRs labeled 'release'.
26+
if: |
27+
github.event_name == 'workflow_dispatch' || (
28+
github.event_name == 'pull_request' &&
29+
github.event.pull_request.merged == true &&
30+
contains(github.event.pull_request.labels.*.name, 'release')
31+
)
2532
outputs:
2633
tag: ${{ steps.ver.outputs.tag }}
2734
version: ${{ steps.ver.outputs.version }}
@@ -38,14 +45,14 @@ jobs:
3845
PR_MERGE=false
3946
else
4047
# pull_request closed event (merged into main)
41-
TITLE="${{ github.event.pull_request.title }}"
42-
if [[ "$TITLE" =~ v([0-9]+\.[0-9]+\.[0-9]+) ]]; then
48+
HEAD_REF="${{ github.event.pull_request.head.ref }}"
49+
if [[ "$HEAD_REF" =~ ^release/v([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
4350
RAW="${BASH_REMATCH[1]}"
44-
TAG="v${RAW}"
4551
else
46-
echo "Failed to extract version from PR title: $TITLE" >&2
52+
echo "Failed to extract version from PR branch name: $HEAD_REF (expected release/vX.Y.Z)" >&2
4753
exit 1
4854
fi
55+
TAG="v${RAW}"
4956
PR_MERGE="${{ github.event.pull_request.merged }}"
5057
fi
5158
CLEANED="${RAW#v}"

0 commit comments

Comments
 (0)