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 2015/07/15 18:06:43 UTC
[1/5] incubator-usergrid git commit: preparing for release
Repository: incubator-usergrid
Updated Branches:
refs/heads/1.0.2 [created] 870dfc165
preparing for release
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7039f060
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7039f060
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7039f060
Branch: refs/heads/1.0.2
Commit: 7039f06001e0ba088331d02fdbe06a4857e0a595
Parents: 1b303e7
Author: Dave Johnson <sn...@gmail.com>
Authored: Wed Jul 15 11:09:17 2015 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Wed Jul 15 11:09:17 2015 -0400
----------------------------------------------------------------------
.usergridversion | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7039f060/.usergridversion
----------------------------------------------------------------------
diff --git a/.usergridversion b/.usergridversion
index 3b585b7..6d7de6e 100644
--- a/.usergridversion
+++ b/.usergridversion
@@ -1 +1 @@
-1.0.2-rc4
+1.0.2
[3/5] incubator-usergrid git commit: Debugging release script
Posted by sn...@apache.org.
Debugging release script
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/904a0a1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/904a0a1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/904a0a1c
Branch: refs/heads/1.0.2
Commit: 904a0a1c351219672476bc3b035387a1db015e02
Parents: a8b5354
Author: Dave Johnson <sn...@gmail.com>
Authored: Wed Jul 15 11:51:40 2015 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Wed Jul 15 11:51:40 2015 -0400
----------------------------------------------------------------------
release/release.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/904a0a1c/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index eb1a808..b34bbc6 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -126,10 +126,9 @@ fi
# Create a branch for the release and update the .usergridversion and tag it
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}."
-
+#echo $current_version > .usergridversion
+#git add .usergridversion
+#git commit -m "Updating .usergridversion to ${current_version}."
git tag -s "${current_version}" -m "usergrid-${current_version} release." $current_version
echo "Push origin"
[4/5] incubator-usergrid git commit: Debugging release script
Posted by sn...@apache.org.
Debugging release script
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ea823f53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ea823f53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ea823f53
Branch: refs/heads/1.0.2
Commit: ea823f5377870be285d0c79740240da194cbfb4c
Parents: 904a0a1
Author: Dave Johnson <sn...@gmail.com>
Authored: Wed Jul 15 12:02:07 2015 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Wed Jul 15 12:02:07 2015 -0400
----------------------------------------------------------------------
release/release.sh | 39 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ea823f53/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index b34bbc6..43b65a6 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -126,17 +126,14 @@ fi
# Create a branch for the release and update the .usergridversion and tag it
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}."
git tag -s "${current_version}" -m "usergrid-${current_version} release." $current_version
echo "Push origin"
-#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
echo "Creating release dir"
@@ -149,8 +146,8 @@ cd $dist_dir
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}
+ 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
@@ -170,18 +167,18 @@ gpg --print-md MD5 ${dist_name}.tar.gz > ${dist_name}.tar.gz.md5
# sha
shasum ${dist_name}.tar.gz > ${dist_name}.tar.gz.sha
-#if [[ $publish == 1 ]]; then
- # Commit the release
-# svn add .
-# svn ci -m "usergrid-${current_version} release"
-
- # Finally delete all release candidate branches
-# for ref in $(git for-each-ref --format='%(refname:short)' 'refs/heads/${current_version}-rc*') do
-# git branch -D ${ref} # line 177: syntax error near unexpected token `git'
-# git push origin --delete ${ref}
-# svn rm ${usergrid_svn_dev_dist_url}/${ref}
-# done
-#fi
+if [[ $publish == 1 ]]; then
+ # Commit the release
+ svn add .
+ svn ci -m "usergrid-${current_version} release"
+
+ # Finally delete all release candidate branches
+ for ref in $(git for-each-ref --format='%(refname:short)' 'refs/heads/${current_version}-rc*') do
+ git branch -D ${ref} # line 177: syntax error near unexpected token `git'
+ git push origin --delete ${ref}
+ svn rm ${usergrid_svn_dev_dist_url}/${ref}
+ done
+fi
current_commit_id=`git rev-parse HEAD`
[5/5] incubator-usergrid git commit: Debugging release script
Posted by sn...@apache.org.
Debugging release script
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/870dfc16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/870dfc16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/870dfc16
Branch: refs/heads/1.0.2
Commit: 870dfc165a501c362138fcbec99e5f15585dbfae
Parents: ea823f5
Author: Dave Johnson <sn...@gmail.com>
Authored: Wed Jul 15 12:05:23 2015 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Wed Jul 15 12:05:23 2015 -0400
----------------------------------------------------------------------
release/release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/870dfc16/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index 43b65a6..a54ebc5 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -126,7 +126,7 @@ fi
# Create a branch for the release and update the .usergridversion and tag it
echo "Creating release branch and tag for ${current_version}"
git checkout -b $current_version
-git tag -s "${current_version}" -m "usergrid-${current_version} release." $current_version
+#git tag -s "${current_version}" -m "usergrid-${current_version} release." $current_version
echo "Push origin"
[2/5] incubator-usergrid git commit: Debugging release script
Posted by sn...@apache.org.
Debugging release script
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a8b5354c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a8b5354c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a8b5354c
Branch: refs/heads/1.0.2
Commit: a8b5354c9798a32925509aef530cd6701356c4ec
Parents: 7039f06
Author: Dave Johnson <sn...@gmail.com>
Authored: Wed Jul 15 11:29:57 2015 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Wed Jul 15 11:29:57 2015 -0400
----------------------------------------------------------------------
release/release.sh | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a8b5354c/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index 411fb80..eb1a808 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -132,31 +132,35 @@ git commit -m "Updating .usergridversion to ${current_version}."
git tag -s "${current_version}" -m "usergrid-${current_version} release." $current_version
+echo "Push origin"
+
#if [[ $publish == 1 ]]; then
#git push origin $current_version
#git push origin --tags
#fi
-dist_name="apache-usergrid-${current_version}-incubating"
+echo "Creating release dir"
+dist_name="apache-usergrid-${current_version}-incubating"
dist_dir=${base_dir}/dist
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
+fi
-# Now that the .usergridversion has been updated to the release version build the release source dist from it
+# Now that the .usergridversion has been updated to the release
+# version build the release source dist from it
cd $base_dir
git archive --prefix=${dist_name}/ -o ${release_dir}/${dist_name}.tar.gz HEAD
-cd ${release_dir}
# Sign the tarball.
+cd ${release_dir}
echo "Signing the distribution"
gpg --armor --output ${release_dir}/${dist_name}.tar.gz.asc --detach-sig ${release_dir}/${dist_name}.tar.gz