Skip to content

Commit b6dbd21

Browse files
committed
fix: update workflow
1 parent 2af646e commit b6dbd21

1 file changed

Lines changed: 9 additions & 27 deletions

File tree

.github/workflows/create-feature-release.yml

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -63,26 +63,7 @@ jobs:
6363
echo "Latest RC number: $LATEST_RC_NUMBER"
6464
echo "Base version: $BASE_VERSION"
6565
66-
- name: Get version from package.json
67-
id: get-package-version
68-
run: |
69-
# Read version from package.json
70-
PACKAGE_VERSION=$(node -p "require('./package.json').version")
71-
72-
# Extract base version and RC number from package.json version (only needed for override action)
73-
if [[ "${{ inputs.action }}" == "override" ]]; then
74-
if [[ "$PACKAGE_VERSION" =~ ^([0-9]+\.[0-9]+\.[0-9]+)-rc([0-9]+) ]]; then
75-
PKG_BASE_VERSION="${BASH_REMATCH[1]}"
76-
PKG_RC_NUMBER="${BASH_REMATCH[2]}"
77-
fi
78-
echo "package_base_version=$PKG_BASE_VERSION" >> $GITHUB_OUTPUT
79-
echo "package_rc_number=$PKG_RC_NUMBER" >> $GITHUB_OUTPUT
80-
echo "Package.json base version: $PKG_BASE_VERSION"
81-
echo "Package.json RC number: $PKG_RC_NUMBER"
82-
fi
83-
84-
echo "package_version=$PACKAGE_VERSION" >> $GITHUB_OUTPUT
85-
echo "Package.json version: $PACKAGE_VERSION"
66+
8667

8768
- name: Calculate new version
8869
id: calculate-version
@@ -94,15 +75,16 @@ jobs:
9475
LATEST_RC_NUMBER=${{ steps.get-latest-rc.outputs.latest_rc_number }}
9576
BASE_VERSION="${{ steps.get-latest-rc.outputs.base_version }}"
9677
NEW_RC_NUMBER=$((LATEST_RC_NUMBER + 1))
78+
NEW_VERSION="$BASE_VERSION-rc$NEW_RC_NUMBER"
79+
NEW_TAG="v$NEW_VERSION"
9780
else
98-
# For "override" action, reuse the same RC number from package.json
99-
NEW_RC_NUMBER=${{ steps.get-package-version.outputs.package_rc_number }}
100-
BASE_VERSION="${{ steps.get-package-version.outputs.package_base_version }}"
81+
# For "override" action, use the latest tag as-is
82+
LATEST_TAG="${{ steps.get-latest-rc.outputs.latest_rc_tag }}"
83+
NEW_VERSION="${LATEST_TAG#v}"
84+
NEW_TAG="$LATEST_TAG"
85+
NEW_RC_NUMBER=${{ steps.get-latest-rc.outputs.latest_rc_number }}
10186
fi
10287
103-
NEW_VERSION="$BASE_VERSION-rc$NEW_RC_NUMBER"
104-
NEW_TAG="v$NEW_VERSION"
105-
10688
echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
10789
echo "new_tag=$NEW_TAG" >> $GITHUB_OUTPUT
10890
echo "new_rc_number=$NEW_RC_NUMBER" >> $GITHUB_OUTPUT
@@ -112,7 +94,7 @@ jobs:
11294
- name: Update package.json version
11395
run: |
11496
NEW_VERSION="${{ steps.calculate-version.outputs.new_version }}"
115-
CURRENT_VERSION="${{ steps.get-package-version.outputs.package_version }}"
97+
CURRENT_VERSION=$(node -p "require('./package.json').version")
11698
if [ "$CURRENT_VERSION" != "$NEW_VERSION" ]; then
11799
npm version "$NEW_VERSION" --no-git-tag-version
118100
echo "Updated package.json version from $CURRENT_VERSION to $NEW_VERSION"

0 commit comments

Comments
 (0)