Skip to content

Commit 9aed187

Browse files
authored
fix(release): trigger release on merged release PR (#5)
## Fixed - Mark release PR commits with a [release ...] message so release jobs run on merge - Make package.json version bump idempotent to avoid failing on unchanged version
1 parent 6dbf084 commit 9aed187

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

.github/workflows/release.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
${COMMIT_MESSAGE}
2929
EOF
3030
cat /tmp/commit_message
31-
if grep -Pq '^\[release .+\] \(#[0-9]{1,5}\)$' /tmp/commit_message; then
31+
if grep -Pq '^\[release .+\](\s+\(#[0-9]{1,5}\))?$' /tmp/commit_message; then
3232
echo "is_release=true" >> "$GITHUB_OUTPUT"
3333
else
3434
echo "is_release=false" >> "$GITHUB_OUTPUT"
@@ -71,7 +71,12 @@ jobs:
7171
VERSION: ${{ steps.prepare_release.outputs.new_release_version }}
7272
run: |
7373
v="${VERSION#v}"
74-
npm version "$v" --no-git-tag-version
74+
current="$(node -p "require('./package.json').version")"
75+
if [ "${current}" = "${v}" ]; then
76+
echo "package.json already at ${v}; skipping npm version"
77+
exit 0
78+
fi
79+
npm version "${v}" --no-git-tag-version
7580
7681
- name: Create pull request
7782
if: ${{ fromJson(steps.prepare_release.outputs.new_release_published) }}
@@ -80,6 +85,7 @@ jobs:
8085
token: ${{ secrets.GITHUB_TOKEN }}
8186
base: ${{ github.ref_name }}
8287
branch: release-from-${{ github.ref_name }}
88+
commit-message: "[release ${{ steps.prepare_release.outputs.new_release_git_tag }}]"
8389
title: "[release ${{ steps.prepare_release.outputs.new_release_git_tag }}]"
8490
body: |
8591
## Description

0 commit comments

Comments
 (0)