[incubator-kyuubi] branch master updated: [KYUUBI #2873] [INFRA][DOCS] Improve release template script

[ul...@apache.org]

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

ulyssesyou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new 9de3365f5 [KYUUBI #2873] [INFRA][DOCS] Improve release template script
9de3365f5 is described below

commit 9de3365f5092184c166fea7c792666640b9cb4e5
Author: ulysses-you <ul...@gmail.com>
AuthorDate: Thu Jun 16 13:53:41 2022 +0800

    [KYUUBI #2873] [INFRA][DOCS] Improve release template script
    
    ### _Why are the changes needed?_
    
    Add $prev_release_version to generate change log link.
    e.g.
    https://github.com/apache/incubator-kyuubi/compare/v1.5.1-incubating...v1.5.2-incubating-rc0
    
    ### _How was this patch tested?_
    - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
    
    - [ ] Add screenshots for manual tests if appropriate
    
    - [ ] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
    
    Closes #2873 from ulysses-you/release.
    
    Closes #2873
    
    3d0b5013 [ulysses-you] improve template
    
    Authored-by: ulysses-you <ul...@gmail.com>
    Signed-off-by: ulysses-you <ul...@apache.org>
---
 build/release/script/dev_kyuubi_vote.sh        | 14 ++++++++++----
 build/release/script/general_incubator_vote.sh |  8 +++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/build/release/script/dev_kyuubi_vote.sh b/build/release/script/dev_kyuubi_vote.sh
index 33c72281a..ed2b2b603 100644
--- a/build/release/script/dev_kyuubi_vote.sh
+++ b/build/release/script/dev_kyuubi_vote.sh
@@ -23,12 +23,14 @@ set -e
 RELEASE_DIR="$(cd "$(dirname "$0")"/..; pwd)"
 
 ######### Please modify the variables ##########
-# release version, e.g. 1.4.0-incubating
+# release version, e.g. v1.4.0-incubating
 release_version=${release_version:-""}
-# release candidate number, e.g. 2
+# release candidate number, e.g. rc2
 release_rc_no=${release_rc_no:-""}
-# previous release candidate number, e.g. 1, could be empty if it is the first vote
+# previous release candidate number, e.g. rc1, could be empty if it is the first vote
 prev_release_rc_no=${prev_release_rc_no:-""}
+# previous release version, e.g. v1.3.0-incubating, this is used to generate change log
+prev_release_version=${prev_release_version:-""}
 # staging repository number, check it under https://repository.apache.org/content/repositories
 repo_no=${repo_no:-""}
 ################################################
@@ -41,6 +43,10 @@ if [[ -z $release_rc_no ]]; then
   echo "Please input release rc number"
   exit 1
 fi
+if [[ -z $prev_release_version ]]; then
+  echo "Please input prev release version which is used to generate change log"
+  exit 1
+fi
 if [[ -z $repo_no ]]; then
   echo "Please input staging repository number, check it under https://repository.apache.org/content/repositories "
   exit 1
@@ -99,7 +105,7 @@ The staging repository for this release can be found at:
 https://repository.apache.org/content/repositories/orgapachekyuubi-${repo_no}/
 ${change_from_pre_commit}
 The release note is available in:
-https://github.com/apache/incubator-kyuubi/releases/tag/${release_rc_tag}
+https://github.com/apache/incubator-kyuubi/compare/${prev_release_version}...${release_rc_tag}
 
 Thanks,
 On behalf of Apache Kyuubi(Incubating) community
diff --git a/build/release/script/general_incubator_vote.sh b/build/release/script/general_incubator_vote.sh
index 35ac75b5d..b00b2b154 100644
--- a/build/release/script/general_incubator_vote.sh
+++ b/build/release/script/general_incubator_vote.sh
@@ -28,6 +28,8 @@ release_version=${release_version:-""}
 release_rc_no=${release_rc_no:-""}
 # previous release candidate number, e.g. rc1, could be empty if it is the first vote
 prev_release_rc_no=${prev_release_rc_no:-""}
+# previous release version, e.g. v1.3.0-incubating, this is used to generate change log
+prev_release_version=${prev_release_version:-""}
 # staging repository number, check it under https://repository.apache.org/content/repositories
 repo_no=${repo_no:-""}
 # vote email address in dev@kyuubi.apache.org, e.g. https://www.mail-archive.com/dev@kyuubi.apache.org/msg01458.html
@@ -44,6 +46,10 @@ if [[ -z $release_rc_no ]]; then
   echo "Please input release rc number"
   exit 1
 fi
+if [[ -z $prev_release_version ]]; then
+  echo "Please input prev release version which is used to generate change log"
+  exit 1
+fi
 if [[ -z $repo_no ]]; then
   echo "Please input staging repository number, check it under https://repository.apache.org/content/repositories"
   exit 1
@@ -119,7 +125,7 @@ The staging repository for this release can be found at:
 https://repository.apache.org/content/repositories/orgapachekyuubi-${repo_no}/
 $change_from_pre_commit
 The release note is available in:
-https://github.com/apache/incubator-kyuubi/releases/tag/${release_rc_tag}
+https://github.com/apache/incubator-kyuubi/compare/${prev_release_version}...${release_rc_tag}
 
 
 Thanks,