Updated version calculation algo

.github/workflows/ci.yml

@@ -78,36 +78,37 @@ jobs:
 
       - name: Update current version
         run: |
-          # Increment patch version by 1 (e.g. 1.64.1 -> 1.64.2)
-          BASE_VERSION=$(node -p "require('./package.json').version.split('-')[0]")
-          IFS='.' read -r MAJOR MINOR PATCH <<< "$BASE_VERSION"
-          if [ -z "$MAJOR" ] || [ -z "$MINOR" ] || [ -z "$PATCH" ]; then
-            echo "Invalid semver: $BASE_VERSION"
+          DESCRIBE=$(git describe --tags --long --match 'v[0-9]*.[0-9]*.[0-9]*' 2>/dev/null || true)
+          echo "DESCRIBE: ${DESCRIBE}"
+          if [ -z "${DESCRIBE}" ]; then
+            echo "No semver tag matching vX.Y.Z found."
             exit 1
           fi
-          if ! [[ "$MAJOR" =~ ^[0-9]+$ && "$MINOR" =~ ^[0-9]+$ && "$PATCH" =~ ^[0-9]+$ ]]; then
-            echo "Invalid semver components (non-numeric): $BASE_VERSION (MAJOR=$MAJOR, MINOR=$MINOR, PATCH=$PATCH)"
-            exit 1
-          fi
-          NEXT_PATCH_VERSION="${MAJOR}.${MINOR}.$((PATCH + 1))"
-
-          # Get commit count: since last tag if exists, otherwise total commits
-          LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
-          if [ -n "$LAST_TAG" ]; then
-            COMMIT_COUNT=$(git rev-list --count HEAD ^${LAST_TAG})
-          else
-            COMMIT_COUNT=$(git rev-list --count HEAD)
-          fi
-
-          # Get short commit SHA
-          SHORT_SHA=$(git rev-parse --short HEAD)
-
-          # Create nightly version: 1.64.2-12-abc1234
-          NIGHTLY_VERSION="${NEXT_PATCH_VERSION}-${COMMIT_COUNT}-${SHORT_SHA}"
-          echo "Setting version to ${NIGHTLY_VERSION}"
-
-          # Update package.json
-          npm version "${NIGHTLY_VERSION}" --no-git-tag-version
+          BASE_TAG=$(printf '%s\n' "${DESCRIBE}" | grep -Eo '^v[0-9]+\.[0-9]+\.[0-9]+')
+          PR_QUALIFIER=$(printf '%s\n' "${DESCRIBE}" | grep -Eo '\-g[0-9a-f]+$' || true)
+          BRANCH_QUALIFIER=$(printf '%s\n' "${DESCRIBE}" | grep -Eo '[0-9]+\-g[0-9a-f]+$' || true)
+          SAFE_REF_NAME="${{ github.ref_name }}"
+          SAFE_REF_NAME="${SAFE_REF_NAME//[^0-9A-Za-z-]/-}"
+
+          case ${{ github.event_name }} in
+            release)
+              TAG="${{ github.event.release.tag_name }}"
+              npm version --allow-same-version --no-git-tag-version --new-version "${TAG#v}"
+              ;;
+            pull_request)
+              npm version -s --allow-same-version --no-git-tag-version --new-version "${BASE_TAG#v}"
+              PR_VERSION="${BASE_TAG#v}-pr${{ github.event.number }}${PR_QUALIFIER}"
+              npm version --no-git-tag-version --new-version "${PR_VERSION}" && echo "Prerelease version set succeeded" || echo "Prerelease version set FAILED with exit code $?"
+              ;;
+            *)
+              npm version -s --allow-same-version --no-git-tag-version --new-version "${BASE_TAG#v}"
+              PR_VERSION="${BASE_TAG#v}-${SAFE_REF_NAME}${BRANCH_QUALIFIER}"
+              npm version --no-git-tag-version --new-version "${PR_VERSION}" && echo "Prerelease version set succeeded" || echo "Prerelease version set FAILED with exit code $?"
+              ;;
+          esac
+          VERSION="$(jq -r ".version" < package.json)"
+          sed -i "s/## Unreleased/## ${VERSION}/" CHANGELOG.md
+          echo "Updated CHANGELOG with version ${VERSION}"
 
       - name: Remove badges
         run: |