Skip to content

Commit 6d0e730

Browse files
fix(tooling): Fix release script (#9374)
Do not stop on git log check Fix next patch release version compute
1 parent 9f546b9 commit 6d0e730

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tooling/perform-release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ echo "✅ Working copy is clean and up-to-date."
6161
# Check the git log history
6262
LAST_RELEASE_TAG=$(git describe --tags --abbrev=0 --match='v[0-9]*.[0-9]*.[0-9]*')
6363
echo "ℹ️ Last release version: $LAST_RELEASE_TAG"
64-
SUSPICIOUS_COMMITS=$(git log --oneline --first-parent "$LAST_RELEASE_TAG"..HEAD | grep -E -v "Merge pull request #" | grep -E -v "\(#")
64+
SUSPICIOUS_COMMITS=$(git log --oneline --first-parent "$LAST_RELEASE_TAG"..HEAD | grep -E -v "Merge pull request #" | grep -E -v "\(#" || true)
6565
if [ -n "$SUSPICIOUS_COMMITS" ]; then
6666
echo "❌ The following commits are not merge commits and may not be suitable for a release:"
6767
echo "$SUSPICIOUS_COMMITS"
@@ -72,7 +72,7 @@ else
7272
fi
7373

7474
# Get the next release version
75-
VERSION=$(echo "$LAST_RELEASE_TAG" | grep -E '^v[0-9]+\.[0-9]+\.0$' | sed 's/^v//')
75+
VERSION=$(echo "$LAST_RELEASE_TAG" | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sed 's/^v//' || true)
7676
if [ -z "$VERSION" ]; then
7777
echo "❌ Unable to determine the next release version from the last release tag: $LAST_RELEASE_TAG"
7878
exit 1

0 commit comments

Comments
 (0)