You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ka...@apache.org on 2017/11/17 23:19:29 UTC

mesos git commit: Use annotated tags in vote.sh and release.sh.

Repository: mesos
Updated Branches:
  refs/heads/master 08d22ffbb -> 94ef10c2d


Use annotated tags in vote.sh and release.sh.

Review: https://reviews.apache.org/r/63889


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/94ef10c2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/94ef10c2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/94ef10c2

Branch: refs/heads/master
Commit: 94ef10c2d4572cbe8c70b40fe3c59524186d6236
Parents: 08d22ff
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Thu Nov 16 15:45:43 2017 -0500
Committer: Kapil Arya <ka...@mesosphere.io>
Committed: Fri Nov 17 18:19:12 2017 -0500

----------------------------------------------------------------------
 docs/release-guide.md |  5 ++---
 support/release.sh    |  2 +-
 support/vote.sh       | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/94ef10c2/docs/release-guide.md
----------------------------------------------------------------------
diff --git a/docs/release-guide.md b/docs/release-guide.md
index d772bca..cc2f1c9 100644
--- a/docs/release-guide.md
+++ b/docs/release-guide.md
@@ -154,7 +154,7 @@ This guide describes the process of doing an official release of Mesos.
 
 3. First tag the required SHA locally.
 
-        $ git tag <X.Y.Z-rcR>
+        $ git tag -a <X.Y.Z-rcR> -m "Tagging Mesos <X.Y.X-rcR>."
 
    **NOTE:** `X.Y.Z` is based on [semantic versioning](http://semver.org/)
    scheme. `R` is release candidate version that starts with 1.
@@ -233,8 +233,7 @@ This guide describes the process of doing an official release of Mesos.
    in `site/data/releases.yml`. It is used to generate the release information
    on the website.
 
-2. Update the [Getting Started](getting-started.md) guide to use the latest
-   release link.
+2. Update the [Building](building.md) guide to use the latest release link.
 
 3. Check out the website from svn.
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/94ef10c2/support/release.sh
----------------------------------------------------------------------
diff --git a/support/release.sh b/support/release.sh
index 725bee6..3aeda92 100755
--- a/support/release.sh
+++ b/support/release.sh
@@ -58,7 +58,7 @@ popd # ${WORK_DIR}
 
 echo "${GREEN}Tagging ${TAG} as ${VERSION} ${NORMAL}"
 
-git tag ${VERSION} ${TAG}
+git tag -a ${VERSION} ${TAG} -m "Tagging Mesos ${VERSION}"
 
 echo "${GREEN}Pushing the git tag to the repository...${NORMAL}"
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/94ef10c2/support/vote.sh
----------------------------------------------------------------------
diff --git a/support/vote.sh b/support/vote.sh
index e9a2347..649eebc 100755
--- a/support/vote.sh
+++ b/support/vote.sh
@@ -19,6 +19,20 @@ VERSION=${1}
 CANDIDATE=${2}
 TAG="${VERSION}-rc${CANDIDATE}"
 
+if ! git rev-parse "$TAG" > /dev/null 2>&1; then
+  echo "Tag $TAG doesn't exist. Please create one using:"
+  echo "  git tag -a $TAG -m \"Tagging Mesos $TAG.\""
+  exit 1
+fi
+
+if [ "$(git cat-file -t $TAG)" != "tag" ]; then
+  echo "Tag $TAG is not annotated. First delete the existing tag using:"
+  echo "  git tag -d $TAG"
+  echo "Then create an annotated tag using:"
+  echo "  git tag -a $TAG -m \"Tagging Mesos $TAG.\""
+  exit 1;
+fi
+
 echo "${GREEN}Tagging and Voting for mesos-${VERSION} candidate ${CANDIDATE}${NORMAL}"
 
 read -p "Hit enter to continue ... "