diff --git a/bamboo-specs/scripts/git-tag.sh b/bamboo-specs/scripts/git-tag.sh index 07b6ff0..b9c2dbf 100755 --- a/bamboo-specs/scripts/git-tag.sh +++ b/bamboo-specs/scripts/git-tag.sh @@ -55,7 +55,7 @@ then fi newVersion="$(poetry version -s)" echo "new release on master with version: $newVersion" -elif [[ "$bamboo_planRepository_branchName" =~ ^(release/|hotfix/|bugfix/|feature/) ]] +elif [[ "$bamboo_planRepository_branchName" =~ ^(release/) ]] then if check_poetry_version then @@ -64,12 +64,22 @@ then fi newVersion="$(poetry version -s)" echo "new release on $bamboo_planRepository_branchName with version: $newVersion" -elif [[ "$bamboo_version_tag" != "dev" ]] +elif [[ "$bamboo_planRepository_branchName" =~ ^(hotfix/|bugfix/|feature/) ]] then - newVersion="${bamboo_version_tag}" - echo "new special version build with: $newVersion" + if check_poetry_version + then + echo "updating version number by one prerelease increment" + poetry version prerelease + fi + newVersion="$(poetry version -s)" + echo "new release on $bamboo_planRepository_branchName with version: $newVersion" +# elif [[ "$bamboo_version_tag" != "dev" ]] +# then +# newVersion="$(poetry version -s)-${bamboo_version_tag}" +# echo "new special version build with: $newVersion" else - newVersion="${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" + poetry version prepatch + newVersion="$(poetry version -s)" echo "dev build with tag: ${newVersion}" fi diff --git a/pyproject.toml b/pyproject.toml index f384e5f..47f04c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyinfra" -version = "1.1.0" +version = "1.1.1a0" description = "" authors = ["Francisco Schulz "] license = "All rights reseverd"