Repository: usergrid Updated Branches: refs/heads/release 1a93bbafb -> 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/release Commit: cf08ffe86c1c02f9cf12afabb478ca40fdf0bcac Parents: 1a93bba Author: Dave Johnson <[email protected]> Authored: Thu Feb 18 09:23:03 2016 -0500 Committer: Dave Johnson <[email protected]> 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 .
