[parquet-format] branch master updated: PARQUET-1687: Update release process (#155)

[ga...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gabor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/parquet-format.git


The following commit(s) were added to refs/heads/master by this push:
     new 3ba830c  PARQUET-1687: Update release process (#155)
3ba830c is described below

commit 3ba830cbdf9eb38b4a23ad98a8c99bc583349fec
Author: Gabor Szadovszky <ga...@apache.org>
AuthorDate: Tue Nov 12 16:56:35 2019 +0100

    PARQUET-1687: Update release process (#155)
    
    Update prepare-release.sh to create RC tags and keep using the current
    RC version with SNAPSHOT for development.
    Update source-release.sh to retrieve the hash of the RC tag.
    Create the new script finalize-release to create the final release tag
    and update the development version.
---
 dev/{prepare-release.sh => finalize-release} | 20 +++++++++++---------
 dev/prepare-release.sh                       | 15 ++++++++++-----
 dev/source-release.sh                        |  4 ++--
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/dev/prepare-release.sh b/dev/finalize-release
old mode 100644
new mode 100755
similarity index 58%
copy from dev/prepare-release.sh
copy to dev/finalize-release
index 2021260..eef6720
--- a/dev/prepare-release.sh
+++ b/dev/finalize-release
@@ -20,20 +20,22 @@
 
 set -e
 
-if [ -z "$2" ]; then
+if [ -z "$3" ]; then
     cat <<EOF
-Usage: $0 <release-version> <new-development-version-without-SNAPSHOT-suffix>
-Example: $0 1.6.0 1.7.0
+Usage: $0 <release-version> <rc-num> <new-development-version-without-SNAPSHOT-suffix>
+Example: $0 2.7.0 0 2.8.0
 EOF
   exit 1
 fi
 
 release_version="$1"
-new_development_version="$2-SNAPSHOT"
+release_tag="apache-parquet-format-$release_version"
+rc_tag="$release_tag-rc$2"
+new_development_version="$3-SNAPSHOT"
 
-tag="apache-parquet-format-$release_version"
+git tag -am "Release Apache Parquet Format $release_version" "$release_tag" "$rc_tag"
+mvn --batch-mode release:update-versions -DdevelopmentVersion="$new_development_version"
+git commit -am 'Prepare for next development iteration'
 
-mvn release:clean
-mvn release:prepare -Dtag="$tag" "-DreleaseVersion=$release_version" -DdevelopmentVersion="$new_development_version"
-
-echo "Finish staging binary artifacts by running: mvn release:perform"
+echo
+echo "Verify the release tag and the current development version then push the changes by running: git push --follow-tags"
diff --git a/dev/prepare-release.sh b/dev/prepare-release.sh
old mode 100644
new mode 100755
index 2021260..7529695
--- a/dev/prepare-release.sh
+++ b/dev/prepare-release.sh
@@ -20,18 +20,23 @@
 
 set -e
 
-if [ -z "$2" ]; then
+[[ $# != 2 ]] && err="Incorrect number of arguments: $#"
+[[ -z $err ]] && ! [[ $1 =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && err="Invalid release version: \"$1\""
+[[ -z $err ]] && ! [[ $2 =~ ^[0-9]+$ ]] && err="Invalid rc number: \"$2\""
+
+if [[ -n $err ]]; then
     cat <<EOF
-Usage: $0 <release-version> <new-development-version-without-SNAPSHOT-suffix>
-Example: $0 1.6.0 1.7.0
+$err
+Usage: $0 <release-version> <rc-num>
+Example: $0 2.7.0 0
 EOF
   exit 1
 fi
 
 release_version="$1"
-new_development_version="$2-SNAPSHOT"
+new_development_version="$release_version-SNAPSHOT"
 
-tag="apache-parquet-format-$release_version"
+tag="apache-parquet-format-$release_version-rc$2"
 
 mvn release:clean
 mvn release:prepare -Dtag="$tag" "-DreleaseVersion=$release_version" -DdevelopmentVersion="$new_development_version"
diff --git a/dev/source-release.sh b/dev/source-release.sh
old mode 100644
new mode 100755
index 8d4e281..16e77c7
--- a/dev/source-release.sh
+++ b/dev/source-release.sh
@@ -41,10 +41,10 @@ tagrc=${tag}-rc${rc}
 
 echo "Preparing source for $tagrc"
 
-release_hash=`git rev-list $tag 2> /dev/null | head -n 1 `
+release_hash=`git rev-list "$tagrc" 2> /dev/null | head -n 1 `
 
 if [ -z "$release_hash" ]; then
-  echo "Cannot continue: unknown git tag: $tag"
+  echo "Cannot continue: unknown git tag: $tagrc"
   exit
 fi