Skip to content

Commit 4f83f34

Browse files
authored
Add an v-2.XX.0-RC00 when release branch is cut (#34522)
1 parent da5eb20 commit 4f83f34

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

.github/workflows/cut_release_branch.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ jobs:
9797
steps:
9898
- name: Validate Next Version
9999
run: |
100+
if [[ ${RELEASE} =~ ([0-9]+\.[0-9]+) ]]; then
101+
echo "RELEASE_CUT_TAG=v${RELEASE}.0-RC00" >> $GITHUB_ENV
102+
else
103+
echo "The input for RELEASE does not match a valid format [0-9]+\.[0-9]+"
104+
exit 1
105+
fi
100106
if [[ $NEXT_RELEASE =~ ([0-9]+\.[0-9]+) ]]; then
101107
echo "NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}.0" >> $GITHUB_ENV
102108
else
@@ -116,7 +122,9 @@ jobs:
116122
sed -i -e "s/master: {}/master: {}\n release-${RELEASE}: {}/g" .asf.yaml
117123
- name: Update master branch
118124
run: |
119-
bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}"
125+
bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}" "--add-tag" "${RELEASE_CUT_TAG}"
126+
echo "==============tag RC00 to current master branch================"
127+
git push origin tag "${RELEASE_CUT_TAG}"
120128
echo "==============Update master branch as following================"
121129
git diff
122130
echo "==============================================================="

release/src/main/scripts/set_version.sh

+10-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
set -e
2626

2727
function usage() {
28-
echo 'Usage: set_version.sh <version> [--release] [--debug] [--git-add]'
28+
echo 'Usage: set_version.sh <version> [--release] [--debug] [--git-add] [--add-tag]'
2929
}
3030

3131
IS_SNAPSHOT_VERSION=yes
@@ -50,6 +50,11 @@ while [[ $# -gt 0 ]] ; do
5050
shift
5151
;;
5252

53+
--add-tag)
54+
shift
55+
ADD_TAG="$1"
56+
shift
57+
;;
5358
*)
5459
if [[ -z "$TARGET_VERSION" ]] ; then
5560
TARGET_VERSION="$1"
@@ -74,6 +79,10 @@ if ! [[ ${TARGET_VERSION} =~ ([0-9]+\.[0-9]+\.[0-9]+) ]];
7479
exit 1
7580
fi
7681

82+
if [[ -n $ADD_TAG ]] ; then
83+
git tag "$ADD_TAG"
84+
fi
85+
7786
if [[ -z "$IS_SNAPSHOT_VERSION" ]] ; then
7887
# Fixing a release version
7988
sed -i -e "s/version=.*/version=$TARGET_VERSION/" gradle.properties

0 commit comments

Comments
 (0)