Skip to content

Commit 9de3365

Browse files
committed
[KYUUBI #2873] [INFRA][DOCS] Improve release template script
### _Why are the changes needed?_ Add $prev_release_version to generate change log link. e.g. 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 3d0b501 [ulysses-you] improve template Authored-by: ulysses-you <ulyssesyou18@gmail.com> Signed-off-by: ulysses-you <ulyssesyou@apache.org>
1 parent 4e97550 commit 9de3365

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

build/release/script/dev_kyuubi_vote.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ set -e
2323
RELEASE_DIR="$(cd "$(dirname "$0")"/..; pwd)"
2424

2525
######### Please modify the variables ##########
26-
# release version, e.g. 1.4.0-incubating
26+
# release version, e.g. v1.4.0-incubating
2727
release_version=${release_version:-""}
28-
# release candidate number, e.g. 2
28+
# release candidate number, e.g. rc2
2929
release_rc_no=${release_rc_no:-""}
30-
# previous release candidate number, e.g. 1, could be empty if it is the first vote
30+
# previous release candidate number, e.g. rc1, could be empty if it is the first vote
3131
prev_release_rc_no=${prev_release_rc_no:-""}
32+
# previous release version, e.g. v1.3.0-incubating, this is used to generate change log
33+
prev_release_version=${prev_release_version:-""}
3234
# staging repository number, check it under https://repository.apache.org/content/repositories
3335
repo_no=${repo_no:-""}
3436
################################################
@@ -41,6 +43,10 @@ if [[ -z $release_rc_no ]]; then
4143
echo "Please input release rc number"
4244
exit 1
4345
fi
46+
if [[ -z $prev_release_version ]]; then
47+
echo "Please input prev release version which is used to generate change log"
48+
exit 1
49+
fi
4450
if [[ -z $repo_no ]]; then
4551
echo "Please input staging repository number, check it under https://repository.apache.org/content/repositories "
4652
exit 1
@@ -99,7 +105,7 @@ The staging repository for this release can be found at:
99105
https://repository.apache.org/content/repositories/orgapachekyuubi-${repo_no}/
100106
${change_from_pre_commit}
101107
The release note is available in:
102-
https://github.com/apache/incubator-kyuubi/releases/tag/${release_rc_tag}
108+
https://github.com/apache/incubator-kyuubi/compare/${prev_release_version}...${release_rc_tag}
103109
104110
Thanks,
105111
On behalf of Apache Kyuubi(Incubating) community

build/release/script/general_incubator_vote.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ release_version=${release_version:-""}
2828
release_rc_no=${release_rc_no:-""}
2929
# previous release candidate number, e.g. rc1, could be empty if it is the first vote
3030
prev_release_rc_no=${prev_release_rc_no:-""}
31+
# previous release version, e.g. v1.3.0-incubating, this is used to generate change log
32+
prev_release_version=${prev_release_version:-""}
3133
# staging repository number, check it under https://repository.apache.org/content/repositories
3234
repo_no=${repo_no:-""}
3335
# 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
4446
echo "Please input release rc number"
4547
exit 1
4648
fi
49+
if [[ -z $prev_release_version ]]; then
50+
echo "Please input prev release version which is used to generate change log"
51+
exit 1
52+
fi
4753
if [[ -z $repo_no ]]; then
4854
echo "Please input staging repository number, check it under https://repository.apache.org/content/repositories"
4955
exit 1
@@ -119,7 +125,7 @@ The staging repository for this release can be found at:
119125
https://repository.apache.org/content/repositories/orgapachekyuubi-${repo_no}/
120126
$change_from_pre_commit
121127
The release note is available in:
122-
https://github.com/apache/incubator-kyuubi/releases/tag/${release_rc_tag}
128+
https://github.com/apache/incubator-kyuubi/compare/${prev_release_version}...${release_rc_tag}
123129
124130
125131
Thanks,

0 commit comments

Comments
 (0)