remove redundancies

This commit is contained in:
Francisco Schulz 2022-11-14 10:39:30 +01:00
parent 37b0280ab6
commit 2d2e72c86e

View File

@ -7,9 +7,9 @@ python3 -m pip install --upgrade pip
pip install poetry pip install poetry
echo "bamboo plan repo branch name: $bamboo_planRepository_branchName" echo "bamboo plan repo branch name: $bamboo_planRepository_branchName"
echo "bamboo version tag: $bamboo_version_tag" echo "bamboo version tag: $bamboo_version_tag"
echo "bamboo plan repo 1 branch: $bamboo_planRepository_1_branch" echo "bamboo plan repo 1 branch: $bamboo_planRepository_1_branch"
echo "bamboo build number: $bamboo_buildNumber" echo "bamboo build number: $bamboo_buildNumber"
# update version in poetry to latest version in git if it is lower # update version in poetry to latest version in git if it is lower
check_poetry_version () { check_poetry_version () {
@ -22,20 +22,20 @@ check_poetry_version () {
echo "latest version tag in git: ${gitVersion}" echo "latest version tag in git: ${gitVersion}"
echo "current version in project: ${projectVersion}" echo "current version in project: ${projectVersion}"
if [[ "$projectVersion" < "$gitVersion" ]] if [[ $projectVersion < $gitVersion ]]
then then
echo "project version is behind" echo "project version is behind"
echo "setting latest git tag as current version" echo "setting latest git tag as current version"
poetry version "$gitVersion" poetry version "$gitVersion"
updateVersion=0 # 0 means all is good means true, yes it's weird updateVersion=0 # 0 means all is good means true, yes it's weird
elif [[ "$projectVersion" == "$gitVersion" ]] elif [[ $projectVersion == $gitVersion ]]
then then
echo "project version matches" echo "project version matches"
echo "keeping the project version" echo "keeping the project version"
updateVersion=0 updateVersion=0
else else
echo "project version is higher" echo "project version is higher (aka. has been manually set in pyproject.toml)"
echo "keeping the project version, be aware that a version might have been skipped" echo "keeping the project version"
updateVersion=1 updateVersion=1
fi fi
else else
@ -46,42 +46,33 @@ check_poetry_version () {
} }
if [[ "$bamboo_planRepository_branchName" == "master" ]] if [[ $bamboo_planRepository_branchName == "master" ]]
then then
if check_poetry_version if check_poetry_version
then then
echo "updating version number by one minor increment" echo "updating version number by one minor increment"
poetry version minor poetry version minor
fi fi
newVersion="$(poetry version -s)" elif [[ $bamboo_planRepository_branchName =~ ^(release/) ]]
echo "new release on master with version: $newVersion"
elif [[ "$bamboo_planRepository_branchName" =~ ^(release/) ]]
then then
if check_poetry_version if check_poetry_version
then then
echo "updating version number by one patch increment" echo "updating version number by one patch increment"
poetry version patch poetry version patch
fi fi
newVersion="$(poetry version -s)" elif [[ $bamboo_planRepository_branchName =~ ^(hotfix/|bugfix/|feature/) ]]
echo "new release on $bamboo_planRepository_branchName with version: $newVersion"
elif [[ "$bamboo_planRepository_branchName" =~ ^(hotfix/|bugfix/|feature/) ]]
then then
if check_poetry_version if check_poetry_version
then then
echo "updating version number by one prerelease increment" echo "updating version number by one prerelease increment"
poetry version prerelease poetry version prerelease
fi 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 else
poetry version prepatch poetry version prerelease
newVersion="$(poetry version -s)" newVersion="$(poetry version -s)-dev"
echo "dev build with tag: ${newVersion}"
fi fi
newVersion="$(poetry version -s)"
"new build on $bamboo_planRepository_branchName with version: ${newVersion}"
echo "gitTag=${newVersion}" > git.tag echo "gitTag=${newVersion}" > git.tag