diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9497194..e4a5bf9 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -6,11 +6,11 @@ tag_name = {new_version} message = Bump version: {current_version} -> {new_version} [bumpversion:file:semver.semver] -search = version = {current_version} -replace = version = {new_version} +search = __version__ = {current_version} +replace = __version__ = {new_version} [semver] -main_branches = develops, env-test, env-stage, env-prod +main_branches = develop major_branches = -minor_branches = feature, RightBrain-Networks/feature +minor_branches = feature patch_branches = hotfix, bugfix diff --git a/Jenkinsfile b/Jenkinsfile index 7e8554a..cc95322 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,13 +6,12 @@ pipeline { environment { SERVICE = 'auto-semver' GITHUB_KEY = 'autosemverDeployKey' - GITHUB_URL = 'https://github.com/RightBrain-Networks/auto-semver' + GITHUB_URL = 'git@github.com:RightBrain-Networks/auto-semver.git' DOCKER_REGISTRY = '356438515751.dkr.ecr.us-east-1.amazonaws.com' - VERSION = "" //Image tag to use for self-versioning - SELF_SEMVER_TAG = "HEAD" + SELF_SEMVER_TAG = "bugfix.pipeline" } stages { @@ -61,7 +60,7 @@ pipeline { // Docker build flags are set via the getDockerBuildFlags() shared library. sh "docker build ${getDockerBuildFlags()} -t ${env.DOCKER_REGISTRY}/${env.SERVICE}:${env.VERSION} ." - //sh "tar -czvf ${env.SERVICE}-${getVersion('-d')}.tar.gz deployer" + sh "tar -czvf ${env.SERVICE}-${env.VERSION}.tar.gz . --exclude='./.git'" } post{ // Update Git with status of build stage. @@ -78,7 +77,16 @@ pipeline { steps { withEcr { sh "docker push ${env.DOCKER_REGISTRY}/${env.SERVICE}:${env.VERSION}" + script + { + if("${env.BRANCH_NAME}" == "develop") + { + sh "docker tag ${env.DOCKER_REGISTRY}/${env.SERVICE}:${env.VERSION} ${env.DOCKER_REGISTRY}/${env.SERVICE}:latest" + sh "docker push ${env.DOCKER_REGISTRY}/${env.SERVICE}:latest" + } + } } + sh "aws s3 cp dist/${env.SERVICE}-*.tar.gz s3://rbn-ops-pkg-us-east-1/${env.SERVICE}/${env.SERVICE}-${env.VERSION}.tar.gz" } post diff --git a/VERSION b/VERSION index 71a5aa4..d93206f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -version=1.0.6 +__version__ = 1.0.6 \ No newline at end of file