yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release-57' into release-57

This commit is contained in:
zmstone 2024-04-24 13:09:06 +02:00
parent 712008bc1d 296442ad8a
commit b66d7a688e
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx/include/emqx_release.hrl
View File

@ -32,7 +32,7 @@
%% `apps/emqx/src/bpapi/README.md' %% `apps/emqx/src/bpapi/README.md'
%% Opensource edition %% Opensource edition
-define(EMQX_RELEASE_CE, "5.6.1"). -define(EMQX_RELEASE_CE, "5.7.0-alpha.1").
%% Enterprise edition %% Enterprise edition
-define(EMQX_RELEASE_EE, "5.6.1"). -define(EMQX_RELEASE_EE, "5.7.0-alpha.1").

4
deploy/charts/emqx-enterprise/Chart.yaml
View File

@ -14,8 +14,8 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # 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. # to the chart and its templates, including the app version.
version: 5.6.1 version: 5.7.0-alpha.1
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
appVersion: 5.6.1 appVersion: 5.7.0-alpha.1

6
scripts/rel/cut.sh
View File

@ -129,6 +129,12 @@ rel_branch() {
e5.6.*) e5.6.*)
echo 'release-56' echo 'release-56'
;; ;;
v5.7.*)
echo 'release-57'
;;
e5.7.*)
echo 'release-57'
;;
*) *)
logerr "Unsupported version tag $TAG" logerr "Unsupported version tag $TAG"
exit 1 exit 1

8
scripts/rel/sync-remotes.sh
View File

@ -5,7 +5,7 @@ set -euo pipefail
# ensure dir # ensure dir
cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/../.." cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/../.."
BASE_BRANCHES=( 'release-56' 'release-55' 'master' ) BASE_BRANCHES=( 'release-57' 'release-56' 'release-55' 'master' )
usage() { usage() {
cat <<EOF cat <<EOF
@ -20,6 +20,7 @@ options:
The uppstream branch of the current branch are as below: The uppstream branch of the current branch are as below:
* release-55: [] # no upstream for 5.5 opensource edition * release-55: [] # no upstream for 5.5 opensource edition
* release-56: [] # no upstream for 5.6 opensource edition * release-56: [] # no upstream for 5.6 opensource edition
* release-57: [] # no upstream for 5.7 opensource edition
* master: [release-5x] # sync release-5x to master * master: [release-5x] # sync release-5x to master
-b|--base: -b|--base:
@ -158,8 +159,11 @@ upstream_branches() {
release-56) release-56)
remote_ref "$base" remote_ref "$base"
;; ;;
release-57)
remote_ref "$base"
;;
master) master)
remote_refs "$base" 'release-55' 'release-56' remote_refs "$base" 'release-55' 'release-56' 'release-57'
;; ;;
esac esac
} }