diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index 299486ad1..83ed8ae56 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -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"). diff --git a/deploy/charts/emqx-enterprise/Chart.yaml b/deploy/charts/emqx-enterprise/Chart.yaml index 652b2bcf5..5231d1c27 100644 --- a/deploy/charts/emqx-enterprise/Chart.yaml +++ b/deploy/charts/emqx-enterprise/Chart.yaml @@ -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 diff --git a/deploy/charts/emqx/Chart.yaml b/deploy/charts/emqx/Chart.yaml index 9444fe14c..0d87c3251 100644 --- a/deploy/charts/emqx/Chart.yaml +++ b/deploy/charts/emqx/Chart.yaml @@ -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 diff --git a/scripts/rel/cut.sh b/scripts/rel/cut.sh index 5b0e855d1..e218f8d0b 100755 --- a/scripts/rel/cut.sh +++ b/scripts/rel/cut.sh @@ -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 diff --git a/scripts/rel/sync-remotes.sh b/scripts/rel/sync-remotes.sh index 9d3da2715..6b41415f0 100755 --- a/scripts/rel/sync-remotes.sh +++ b/scripts/rel/sync-remotes.sh @@ -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 <