diff --git a/README.md b/README.md index 65ed157..f117640 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ts-api [![Version](https://img.shields.io/badge/Version-v2.0.0-blue.svg)](https://semver.org) +# ts-api [![Version](https://img.shields.io/badge/Version-v2.1.0-blue.svg)](https://semver.org) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=vinjatovix_ts-api&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=vinjatovix_ts-api) ## Quality report diff --git a/docker-compose.yaml b/docker-compose.yaml index 9361535..46a1a2f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,7 +4,7 @@ services: build: context: . dockerfile: Dockerfile - image: ts-api:2.0.0 + image: ts-api:2.1.0 container_name: ts-api ports: - "3000:3000" diff --git a/scripts/update_readme_version.sh b/scripts/update_readme_version.sh index be2dcd5..287aaa6 100755 --- a/scripts/update_readme_version.sh +++ b/scripts/update_readme_version.sh @@ -22,13 +22,12 @@ if [[ ! "$BRANCH" =~ ^release/ ]]; then fi # Obtain the current version -CURRENT_VERSION=$(node -p "require('./package.json').version") +CURRENT_VERSION=$(git describe --tags --abbrev=0 | sed 's/^v//') +NEW_VERSION=$(node -p "require('./package.json').version") -# Obtain the new version without creating a git tag and remove 'v' prefix -NEW_VERSION=$(npm --no-git-tag-version version "$RELEASE_TYPE" | sed 's/^v//') - -echo -e "Current version: ${GREEN}$CURRENT_VERSION${NC}" -echo -e "New version: ${GREEN}$NEW_VERSION${NC}" +echo -e "Last tag: ${GREEN}$CURRENT_VERSION${NC}" +echo -e "New release: ${GREEN}$NEW_VERSION${NC}" +# NEW_VERSION=$(npm --no-git-tag-version version "$RELEASE_TYPE" | sed 's/^v//') # Function to replace version in files replace_version() { diff --git a/src/apps/apiApp/openApi.yaml b/src/apps/apiApp/openApi.yaml index 54a8fb3..6a3d149 100644 --- a/src/apps/apiApp/openApi.yaml +++ b/src/apps/apiApp/openApi.yaml @@ -13,7 +13,7 @@ info: license: name: MIT License url: https://github.com/vinjatovix/ts-api/blob/develop/LICENSE.md - version: '2.0.0' + version: '2.1.0' servers: - url: HOST @@ -894,7 +894,7 @@ components: status: type: string example: - version: 2.0.0 + version: 2.1.0 status: OK Author: