Merge pull request #367 from benjaminbollen/develop

a. issue366 only deploy from branch `release-0.12` for DEVELOP
hyperledger-archives · Nov 14, 2016 · de4f9d7 · de4f9d7
2 parents e3cb52b + 804f5c5
commit de4f9d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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