From 8b0d99d65dc1f7ad1a0a90a946de2f5dcf963176 Mon Sep 17 00:00:00 2001
From: Ta-Ching Chen <hello@tachingchen.com>
Date: Mon, 18 Nov 2019 15:54:43 +0800
Subject: [PATCH] Support semantic version tags (#1416)

---
 hack/Releasing.txt | 15 +++++++++------
 hack/release.sh    | 12 ++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/hack/Releasing.txt b/hack/Releasing.txt
index d8b1e4a0..6778360a 100644
--- a/hack/Releasing.txt
+++ b/hack/Releasing.txt
@@ -44,7 +44,7 @@ Updating Fission Repo (https://github.com/fission/fission)
 
 1. cd to the top of the fission repo, create a branch:
 
-   git checkout -b vX.Y.Z
+   git checkout -b release-X.Y.Z
 
 2. Change references of old version to new version in charts directory. You use replace and find all with a quick preview in your IDE.
 
@@ -52,7 +52,7 @@ Updating Fission Repo (https://github.com/fission/fission)
 
    `./hack/release.sh <VERSION>`
 
-   This script checks to make sure you're releasing from the vX.Y.Z
+   This script checks to make sure you're releasing from the release-X.Y.Z
    branch, and that your repo is clean (no modified/staged files).
 
    This will take a while as it builds and pushes all images (Approx ~2-3 hours)
@@ -61,10 +61,13 @@ Updating Fission Repo (https://github.com/fission/fission)
 
 5. As part of release script, changelog.md has been modified. Take a look at it, correct it if you want and then commit it, discard other directories etc. produced by builders after inspection.
 
-6. Now push this vx.y.z branch to remote repo. Create a PR and merge it into master branch. 
+6. Push this release-x.y.z branch to remote repo. Create a PR and wait for CI passed.
 
-a. Test build from master branch for sanity check
-b. Make sure the master build is green
+7. Now manually merge the release-x.y.z branch into master branch with Git command to prevent the commit SHA from being changed.
+
+    `git checkout master && git merge --ff-only release-<VERSION>`
+
+8. Test build from master branch for sanity check and make sure the master build is green
 
 Updating Fission Charts (https://github.com/fission/fission-charts)
 ------------------------------
@@ -85,7 +88,7 @@ Before you save the release - UNCHECK the "This is a pre-release" checkbox. This
 Updating Fission Docs (https://github.com/fission/docs.fission.io)
 ------------------------------
 
-9. Documentatin Update 
+9. Documentation Update
 
 a. Merge documentation PRs that are peer reviewed and get latest master locally.
 
diff --git a/hack/release.sh b/hack/release.sh
index 56aa7cf5..b035cc29 100755
--- a/hack/release.sh
+++ b/hack/release.sh
@@ -12,9 +12,9 @@ BUILDDIR=$(realpath $DIR)/build
 check_branch() {
     local version=$1
     curr_branch=$(git rev-parse --abbrev-ref HEAD)
-    if [ $curr_branch != "v${version}" ]
+    if [ $curr_branch != "release-${version}" ]
     then
-	echo "Not on v${version} branch."
+	echo "Not on release-${version} branch."
 	exit 1
     fi
 }
@@ -150,7 +150,7 @@ push_all() {
 
 tag_and_release() {
     local version=$1
-    local gittag=$version
+    local gittag="v${version}"
 
     # tag the release
     git tag $gittag
@@ -170,7 +170,7 @@ tag_and_release() {
 
 attach_github_release_cli() {
     local version=$1
-    local gittag=$version
+    local gittag="v${version}"
     # cli
     echo "Uploading osx cli"
     gothub upload \
@@ -202,7 +202,7 @@ attach_github_release_cli() {
 
 attach_github_release_charts() {
     local version=$1
-    local gittag=$version
+    local gittag="v${version}"
 
     # helm charts
     gothub upload \
@@ -225,7 +225,7 @@ attach_github_release_charts() {
 
 attach_github_release_yamls() {
     local version=$1
-    local gittag=$version
+    local gittag="v${version}"
 
     for c in fission-all fission-core
     do