chore: 5.4.0-alpha.1
This commit is contained in:
parent
9c30a7bbe7
commit
0e27d031a8
|
@ -32,10 +32,10 @@
|
|||
%% `apps/emqx/src/bpapi/README.md'
|
||||
|
||||
%% Opensource edition
|
||||
-define(EMQX_RELEASE_CE, "5.3.2").
|
||||
-define(EMQX_RELEASE_CE, "5.4.0-alpha.1").
|
||||
|
||||
%% Enterprise edition
|
||||
-define(EMQX_RELEASE_EE, "5.3.2").
|
||||
-define(EMQX_RELEASE_EE, "5.4.0-alpha.1").
|
||||
|
||||
%% The HTTP API version
|
||||
-define(EMQX_API_VERSION, "5.0").
|
||||
|
|
|
@ -14,8 +14,8 @@ type: application
|
|||
|
||||
# This is the chart version. This version number should be incremented each time you make changes
|
||||
# to the chart and its templates, including the app version.
|
||||
version: 5.3.2
|
||||
version: 5.4.0-alpha.1
|
||||
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application.
|
||||
appVersion: 5.3.2
|
||||
appVersion: 5.4.0-alpha.1
|
||||
|
|
|
@ -14,8 +14,8 @@ type: application
|
|||
|
||||
# This is the chart version. This version number should be incremented each time you make changes
|
||||
# to the chart and its templates, including the app version.
|
||||
version: 5.3.2
|
||||
version: 5.4.0-alpha.1
|
||||
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application.
|
||||
appVersion: 5.3.2
|
||||
appVersion: 5.4.0-alpha.1
|
||||
|
|
|
@ -23,6 +23,7 @@ options:
|
|||
release-51
|
||||
release-52
|
||||
release-53
|
||||
release-54
|
||||
NOTE: this option should be used when --dryrun.
|
||||
|
||||
--dryrun: Do not actually create the git tag.
|
||||
|
@ -37,7 +38,7 @@ options:
|
|||
For 5.X series the current working branch must be 'release-5X'
|
||||
--.--[ master ]---------------------------.-----------.---
|
||||
\\ /
|
||||
\`---[release-53]----(v5.3.1 | e5.3.1)
|
||||
\`---[release-54]----(v5.4.0 | e5.4.0)
|
||||
EOF
|
||||
}
|
||||
|
||||
|
@ -136,6 +137,12 @@ rel_branch() {
|
|||
e5.3.*)
|
||||
echo 'release-53'
|
||||
;;
|
||||
v5.4.*)
|
||||
echo 'release-54'
|
||||
;;
|
||||
e5.4.*)
|
||||
echo 'release-54'
|
||||
;;
|
||||
*)
|
||||
logerr "Unsupported version tag $TAG"
|
||||
exit 1
|
||||
|
|
|
@ -5,7 +5,7 @@ set -euo pipefail
|
|||
# ensure dir
|
||||
cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/../.."
|
||||
|
||||
BASE_BRANCHES=( 'release-53' 'release-52' 'release-51' 'master' )
|
||||
BASE_BRANCHES=( 'release-54' 'release-53' 'release-52' 'release-51' 'master' )
|
||||
|
||||
usage() {
|
||||
cat <<EOF
|
||||
|
@ -18,10 +18,11 @@ options:
|
|||
It tries to merge (by default with --ff-only option)
|
||||
upstreams branches for the current working branch.
|
||||
The uppstream branch of the current branch are as below:
|
||||
* release-54: [] # no upstream for 5.4 opensource edition
|
||||
* release-53: [] # no upstream for 5.3 opensource edition
|
||||
* release-52: [] # no upstream for 5.2 opensource edition
|
||||
* release-51: [] # no upstream for 5.1 opensource edition
|
||||
* master: [release-53] # sync release-53 to master
|
||||
* master: [release-54] # sync release-54 to master
|
||||
|
||||
-b|--base:
|
||||
The base branch of current working branch if currently is not
|
||||
|
@ -153,6 +154,9 @@ remote_refs() {
|
|||
upstream_branches() {
|
||||
local base="$1"
|
||||
case "$base" in
|
||||
release-54)
|
||||
remote_ref "$base"
|
||||
;;
|
||||
release-53)
|
||||
remote_ref "$base"
|
||||
;;
|
||||
|
@ -163,7 +167,7 @@ upstream_branches() {
|
|||
remote_ref "$base"
|
||||
;;
|
||||
master)
|
||||
remote_refs "$base" 'release-53'
|
||||
remote_refs "$base" 'release-54'
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue