From 030acb0f56812347e5b3473f1e600e71b71ed837 Mon Sep 17 00:00:00 2001
From: Alex Collins <alexec@users.noreply.github.com>
Date: Mon, 17 Jun 2019 10:45:32 -0700
Subject: [PATCH] Fix bug in release (#1748)

---
 Makefile                          |  2 +-
 docs/developer-guide/releasing.md | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 0054202eed..b8d3ce1ff0 100644
--- a/Makefile
+++ b/Makefile
@@ -191,4 +191,4 @@ release-precheck: manifests
 	@if [ "$(GIT_TAG)" != "v`cat VERSION`" ]; then echo 'VERSION does not match git tag'; exit 1; fi
 
 .PHONY: release
-release: release-precheck pre-commit image release-cli
+release: pre-commit release-precheck image release-cli
diff --git a/docs/developer-guide/releasing.md b/docs/developer-guide/releasing.md
index cd92447234..c3953d6244 100644
--- a/docs/developer-guide/releasing.md
+++ b/docs/developer-guide/releasing.md
@@ -19,9 +19,11 @@ Set the `VERSION` environment variable:
 # release candidate
 VERSION=v1.0.0-rc1
 # GA release
-VERSION=v1.0.0
+VERSION=v1.0.2
 ```
 
+Prior to v1.1, the UI is in a separate repo.
+
 If not already created, create UI release branch:
 
 ```bash
@@ -29,11 +31,13 @@ cd argo-cd-ui
 git checkout -b $BRANCH
 ```
 
-Tag UI:
+Tag and release UI:
 
 ```bash
+git checkout $BRANCH
 git tag $VERSION
 git push $REPO $BRANCH --tags
+git clean -fd
 IMAGE_NAMESPACE=argoproj IMAGE_TAG=$VERSION DOCKER_PUSH=true yarn docker
 ```
 
@@ -48,6 +52,7 @@ git push $REPO $BRANCH
 Update `VERSION` and manifests with new version:
 
 ```bash
+git checkout $BRANCH
 echo ${VERSION:1} > VERSION
 make manifests IMAGE_TAG=$VERSION
 git commit -am "Update manifests to $VERSION"
@@ -58,6 +63,7 @@ Tag, build, and push release to Docker Hub
 
 ```bash
 git tag $VERSION
+git clean -fd
 make release IMAGE_NAMESPACE=argoproj IMAGE_TAG=$VERSION DOCKER_PUSH=true
 git push $REPO $VERSION
 ```
@@ -66,7 +72,7 @@ Update [Github releases](https://github.com/argoproj/argo-cd/releases) with:
 
 * Getting started (copy from previous release)
 * Changelog
-* Binaries (e.g. dist/argocd-darwin-amd64).
+* Binaries (e.g. `dist/argocd-darwin-amd64`).
 
 
 If GA, update `stable` tag:
@@ -80,8 +86,10 @@ If GA, update Brew formula:
 ```bash
 git clone https://github.com/argoproj/homebrew-tap
 cd homebrew-tap
+git checkout master
+git pull
 ./update.sh ~/go/src/github.com/argoproj/argo-cd/dist/argocd-darwin-amd64
-git commit -a -m "Update argocd to $VERSION"
+git commit -am "Update argocd to $VERSION"
 git push
 ```