diff --git a/circle.yml b/circle.yml index bf00b3536768df05d54c723576ada7be12547a00..e481becef5fc93baf787d294ef7b844fb92f740e 100644 --- a/circle.yml +++ b/circle.yml @@ -37,16 +37,16 @@ test: deployment: - master: - branch: master + release-0.12: + branch: release commands: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io - tests/build_tool.sh - "docker tag quay.io/eris/db:build throw:build && docker rmi quay.io/eris/db:build" - docker push quay.io/eris/db - - docs/build.sh master - develop: - branch: develop + - docs/build.sh release + master: + branch: master commands: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io - tests/build_tool.sh diff --git a/docs/build.sh b/docs/build.sh index 5894ad346e0b1060fdc0ef5a049bba058004d3a4..d2f09724600e3262bcd8d63e9bfc54567cc81144 100755 --- a/docs/build.sh +++ b/docs/build.sh @@ -28,7 +28,7 @@ cd $repo rm -rf $docs_name go run ./docs/generator.go -if [[ "$1" == "master" ]] +if [[ "$1" == "release" ]] then mkdir -p $docs_name/$slim_name/latest rsync -av $docs_name/$slim_name/$release_min/ $docs_name/$slim_name/latest/ diff --git a/tests/build_tool.sh b/tests/build_tool.sh index 3085e694503b6309846811a608ade0111f58b6be..b32f941b823b28d3850858dbab7345c9b0e8f5ab 100755 --- a/tests/build_tool.sh +++ b/tests/build_tool.sh @@ -45,7 +45,7 @@ rm $REPO/"$TARGET"_build_artifact rm $REPO/eris-client # Extra Tags -if [[ "$branch" = "master" ]] +if [[ "$branch" = "release" ]] then docker tag -f $IMAGE:$release_min $IMAGE:$release_maj docker tag -f $IMAGE:$release_min $IMAGE:latest