From 4a558aa3cd58b7215190a6e8cfb0d7ff6623acd5 Mon Sep 17 00:00:00 2001 From: tareq Date: Sun, 3 Aug 2025 22:17:40 +0200 Subject: [PATCH 1/2] chore: enhance prerelease versioning logic for pull requests --- .github/workflows/release.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b8c5546..da8b961 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -157,10 +157,27 @@ jobs: # Update version if [[ "$RELEASE_TYPE" == "prerelease" ]]; then - if [[ "$IS_PRERELEASE" == "true" ]]; then - npm version prerelease --preid="$PRERELEASE_TAG" --no-git-tag-version + # For PR prereleases, check if a version with this preid already exists + if [[ "${{ github.event_name }}" == "pull_request" ]]; then + # Get current version and check if it already has this preid + CURRENT_VERSION=$(node -p "require('./package.json').version") + echo "Current version: $CURRENT_VERSION" + + # Check if current version already contains our prerelease tag + if [[ "$CURRENT_VERSION" == *"-${PRERELEASE_TAG}."* ]]; then + echo "Found existing prerelease version, incrementing..." + npm version prerelease --no-git-tag-version + else + echo "Creating new prerelease version..." + npm version prerelease --preid="$PRERELEASE_TAG" --no-git-tag-version + fi else - npm version "$RELEASE_TYPE" --preid="$PRERELEASE_TAG" --no-git-tag-version + # For other prerelease types (develop branch, manual) + if [[ "$IS_PRERELEASE" == "true" ]]; then + npm version prerelease --preid="$PRERELEASE_TAG" --no-git-tag-version + else + npm version "$RELEASE_TYPE" --preid="$PRERELEASE_TAG" --no-git-tag-version + fi fi NPM_TAG="$PRERELEASE_TAG" else From 707d374bd8a5a3318497bd01068dc931b5e6bbfb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 3 Aug 2025 20:18:15 +0000 Subject: [PATCH 2/2] chore: release v0.0.38 --- packages/ng-openapi/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ng-openapi/package.json b/packages/ng-openapi/package.json index 12a8e83..c9cf645 100644 --- a/packages/ng-openapi/package.json +++ b/packages/ng-openapi/package.json @@ -1,6 +1,6 @@ { "name": "ng-openapi", - "version": "0.0.37", + "version": "0.0.38", "description": "Generate Angular services and TypeScript types from OpenAPI/Swagger specifications", "keywords": [ "angular",