You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/02/18 16:42:03 UTC
[1/3] usergrid git commit: Still reparing for release.
Repository: usergrid
Updated Branches:
refs/heads/2.1.0 [created] 58c9a7b93
Still reparing for release.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/cf08ffe8
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/cf08ffe8
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/cf08ffe8
Branch: refs/heads/2.1.0
Commit: cf08ffe86c1c02f9cf12afabb478ca40fdf0bcac
Parents: 1a93bba
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Feb 18 09:23:03 2016 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Feb 18 09:23:03 2016 -0500
----------------------------------------------------------------------
release/release.sh | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/cf08ffe8/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index 2c7b51b..e5e138c 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -146,20 +146,21 @@ fi
echo "Creating release branch and tag for ${current_version}"
git checkout -b $current_version
-echo $current_version > .usergridversion
-git add .usergridversion
-git commit -m "Updating .usergridversion to ${current_version}."
+
+# don't need this, the usergridversion is already up to date
+#echo $current_version > .usergridversion
+#git add .usergridversion
+#git commit -m "Updating .usergridversion to ${current_version}."
# TODO: ensure that the tag has the same date as the last commit made
-# in the release branch
git tag -s "${current_version}" -m "usergrid-${current_version} release." $current_version
-#if [[ $publish == 1 ]]; then
- #git push origin $current_version
- #git push origin --tags
-#fi
+if [[ $publish == 1 ]]; then
+ git push origin $current_version
+ git push origin --tags
+fi
#----------------------------------------------------------------------------------
@@ -172,12 +173,12 @@ release_dir=${dist_dir}/${current_version}
mkdir -p $release_dir
cd $dist_dir
-#if [[ $publish == 1 ]]; then
-# echo "Publishing the release"
+if [[ $publish == 1 ]]; then
+ echo "Publishing the release"
# Make and checkout the release dist directory
-# svn mkdir ${usergrid_svn_dist_url}/${current_version} -m "usergrid-${current_version} release"
-# svn co --depth=empty ${usergrid_svn_dist_url}/${current_version} ${release_dir}
-#fi
+ svn mkdir ${usergrid_svn_dist_url}/${current_version} -m "usergrid-${current_version} release"
+ svn co --depth=empty ${usergrid_svn_dist_url}/${current_version} ${release_dir}
+fi
# Now that the .usergridversion has been updated to the release version build
# the release source dist from it
@@ -214,6 +215,7 @@ gpg --print-md MD5 ${binary_name}.tar.gz > ${binary_name}.tar.gz.md5
shasum ${dist_name}.tar.gz > ${dist_name}.tar.gz.sha
shasum ${binary_name}.tar.gz > ${binary_name}.tar.gz.sha
+# do this part by hand for now:
#if [[ $publish == 1 ]]; then
# Commit the release
# svn add .
[2/3] usergrid git commit: Still preparing for release.
Posted by sn...@apache.org.
Still preparing for release.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/9c3c1460
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/9c3c1460
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/9c3c1460
Branch: refs/heads/2.1.0
Commit: 9c3c1460fb8d18122a5588bf02966208a998693d
Parents: cf08ffe
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Feb 18 09:25:47 2016 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Feb 18 09:25:47 2016 -0500
----------------------------------------------------------------------
release/release.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/9c3c1460/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index e5e138c..38ed413 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -189,10 +189,10 @@ git archive --prefix=${dist_name}/ -o ${release_dir}/${dist_name}.tar.gz HEAD
#----------------------------------------------------------------------------------
# Build the binary distribution from the new branch
-binary_name="apache-usergrid-${current_version_tag}-binary"
+binary_name="apache-usergrid-${current_version}-binary"
pushd release
-./binary-release.sh ${current_version_tag}
+./binary-release.sh ${current_version}
cp target/${binary_name}.tar.gz ${dist_dir}
popd
[3/3] usergrid git commit: Correct release directory for binary,
correct tag for release.
Posted by sn...@apache.org.
Correct release directory for binary, correct tag for release.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/58c9a7b9
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/58c9a7b9
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/58c9a7b9
Branch: refs/heads/2.1.0
Commit: 58c9a7b932071b72cacaf2663f2b6e416c96bcf0
Parents: 9c3c146
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Feb 18 09:53:40 2016 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Feb 18 09:53:40 2016 -0500
----------------------------------------------------------------------
release/release.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/58c9a7b9/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index 38ed413..7cfc5cd 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -155,7 +155,7 @@ git checkout -b $current_version
# TODO: ensure that the tag has the same date as the last commit made
-git tag -s "${current_version}" -m "usergrid-${current_version} release." $current_version
+git tag -s "usergrid-${current_version}" -m "usergrid-${current_version} release." $current_version
if [[ $publish == 1 ]]; then
git push origin $current_version
@@ -193,7 +193,7 @@ binary_name="apache-usergrid-${current_version}-binary"
pushd release
./binary-release.sh ${current_version}
-cp target/${binary_name}.tar.gz ${dist_dir}
+cp target/${binary_name}.tar.gz ${release_dir}
popd