diff --git a/bamboo-specs/scripts/git-tag.sh b/bamboo-specs/scripts/git-tag.sh index 25db9e5..a0b2d8c 100755 --- a/bamboo-specs/scripts/git-tag.sh +++ b/bamboo-specs/scripts/git-tag.sh @@ -10,7 +10,6 @@ echo "bamboo plan repo branch name: $bamboo_planRepository_branchName" echo "bamboo version tag: $bamboo_version_tag" echo "bamboo plan repo 1 branch: $bamboo_planRepository_1_branch" echo "bamboo build number: $bamboo_buildNumber" -echo $(cat pyproject.toml) # update version in poetry to latest version in git if it is lower check_poetry_version () { @@ -61,19 +60,21 @@ then echo "updating version number by one patch increment" poetry version patch fi -elif [[ $bamboo_planRepository_branchName =~ ^(hotfix/|bugfix/|feature/) ]] +else then if check_poetry_version then echo "updating version number by one prerelease increment" poetry version prerelease fi +fi + +if [[ $bamboo_planRepository_branchName =~ ^(hotfix/|bugfix/|feature/) ]] +then + newVersion="$(poetry version -s)" else - poetry version prerelease newVersion="$(poetry version -s)-dev" fi -newVersion=$(poetry version -s) echo "new build on $bamboo_planRepository_branchName with version: $newVersion" - echo "gitTag=$newVersion" > git.tag