From 43a3433e0b369a88dfd59005aeaa2594d7bd6056 Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@monax.io>
Date: Mon, 7 Nov 2016 16:43:15 +0100
Subject: [PATCH] circle: only deploy from branch release-0.12
---
circle.yml | 10 +++++-----
docs/build.sh | 2 +-
tests/build_tool.sh | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/circle.yml b/circle.yml
index bf00b353..e481bece 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 5894ad34..d2f09724 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 3085e694..b32f941b 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
--
GitLab