Merge pull request #10876 from zmstone/merge-release-51-back-to-master

Merge release 51 back to master

.github/pull_request_template.md

@@ -1,6 +1,6 @@
 Fixes <issue-or-jira-number>
 
-<!-- Make sure to target release-50 branch if this PR is intended to fix the issues for the release candidate. -->
+<!-- Make sure to target release-51 branch if this PR is intended to fix the issues for the release candidate. -->
 
 ## Summary
 copilot:summary

.github/workflows/build_packages_cron.yaml

@@ -23,7 +23,7 @@ jobs:
       matrix:
         profile:
           - ['emqx', 'master']
-          - ['emqx-enterprise', 'release-50']
+          - ['emqx-enterprise', 'release-51']
         otp:
           - 24.3.4.2-3
         arch:

.github/workflows/build_slim_packages.yaml

@@ -8,7 +8,7 @@ on:
   push:
     branches:
       - master
-      - release-50
+      - release-51
   pull_request:
     # GitHub pull_request action is by default triggered when
     # opened reopened or synchronize,

apps/emqx/include/emqx_release.hrl

@@ -32,10 +32,10 @@
 %% `apps/emqx/src/bpapi/README.md'
 
 %% Community edition
--define(EMQX_RELEASE_CE, "5.0.26").
+-define(EMQX_RELEASE_CE, "5.1.0-alpha.1").
 
 %% Enterprise edition
--define(EMQX_RELEASE_EE, "5.0.4").
+-define(EMQX_RELEASE_EE, "5.1.0-alpha.1").
 
 %% the HTTP API version
 -define(EMQX_API_VERSION, "5.0").

apps/emqx/src/bpapi/README.md

@@ -149,6 +149,7 @@ After releasing, let's say, 5.1.0, the following actions should be performed to
 
 1. Checkout 5.1.0 tag
 1. Build the code
+1. Replace api version string `"master"` in `apps/emqx/test/emqx_static_checks_data/master.bpapi` with `"5.1"`
 1. Rename `apps/emqx/test/emqx_static_checks_data/master.bpapi` to `apps/emqx/test/emqx_static_checks_data/5.1.bpapi`
 1. Add `apps/emqx/test/emqx_static_checks_data/5.1.bpapi` to the repo
 1. Delete the previous file (e.g. `5.0.bpapi`), unless there is plan to support rolling upgrade from 5.0 to 5.2

apps/emqx/src/emqx.app.src

@@ -2,8 +2,7 @@
 {application, emqx, [
     {id, "emqx"},
     {description, "EMQX Core"},
-    % strict semver, bump manually!
+    {vsn, "5.1.0"},
-    {vsn, "5.0.27"},
     {modules, []},
     {registered, []},
     {applications, [

apps/emqx_ft/src/emqx_ft.app.src

@@ -1,6 +1,6 @@
 {application, emqx_ft, [
     {description, "EMQX file transfer over MQTT"},
-    {vsn, "0.1.1"},
+    {vsn, "0.1.2"},
     {registered, []},
     {mod, {emqx_ft_app, []}},
     {applications, [

scripts/conf-test/run.sh

@@ -13,7 +13,7 @@ start_emqx_with_conf() {
     "$EMQX_ROOT"/bin/emqx stop
 }
 
-MINOR_VSN=$(./pkg-vsn.sh "$PROFILE" | cut -d. -f1,2)
+MAJOR_VSN=$(./pkg-vsn.sh "$PROFILE" | cut -d. -f1)
 
 if [ "$PROFILE" = "emqx" ]; then
   PREFIX="v"
@@ -21,7 +21,7 @@ else
   PREFIX="e"
 fi
 
-FILES=$(ls ./scripts/conf-test/old-confs/$PREFIX"$MINOR_VSN"*)
+FILES=$(ls ./scripts/conf-test/old-confs/"${PREFIX}${MAJOR_VSN}"*)
 
 cp "$EMQX_ROOT"/etc/emqx.conf "$EMQX_ROOT"/etc/emqx.conf.bak
 cleanup() {

scripts/rel/cut.sh

@@ -13,14 +13,14 @@ usage() {
     cat <<EOF
 $0 RELEASE_GIT_TAG [option]
 RELEASE_GIT_TAG is a 'v*' or 'e*' tag for example:
-  v5.0.12
+  v5.1.1
-  e5.0.0-beta.6
+  e5.1.0-beta.6
 
 options:
   -h|--help:         Print this usage.
 
   -b|--base:         Specify the current release base branch, can be one of
-                     release-50
+                     release-51
                      NOTE: this option should be used when --dryrun.
 
   --dryrun:          Do not actually create the git tag.
@@ -35,10 +35,10 @@ options:
                      in addition to regular :<version> one
 
 
-NOTE: For 5.0 series the current working branch must be 'release-50'
+NOTE: For 5.1 series the current working branch must be 'release-51'
       --.--[  master  ]---------------------------.-----------.---
          \\                                      /
-          \`---[release-50]----(v5.0.20 | e5.0.1)
+          \`---[release-51]----(v5.1.1 | e5.1.1)
 EOF
 }
 
@@ -127,11 +127,11 @@ done
 rel_branch() {
     local tag="$1"
     case "$tag" in
-        v5.0.*)
+        v5.1.*)
-            echo 'release-50'
+            echo 'release-51'
             ;;
-        e5.0.*)
+        e5.1.*)
-            echo 'release-50'
+            echo 'release-51'
             ;;
         *)
             logerr "Unsupported version tag $TAG"
@@ -270,10 +270,6 @@ else
         *beta*)
             true
             ;;
-        e5.0.0*)
-            # the first release has no change log
-            true
-            ;;
         *)
             generate_changelog
             ;;

scripts/rel/sync-remotes.sh

@@ -5,7 +5,7 @@ set -euo pipefail
 # ensure dir
 cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/../.."
 
-BASE_BRANCHES=( 'release-50' 'master' )
+BASE_BRANCHES=( 'release-51' 'master' )
 
 usage() {
     cat <<EOF
@@ -18,8 +18,8 @@ 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-50: []        # no upstream for 5.0 opensource edition
+    * release-51: []        # no upstream for 5.0 opensource edition
-    * master: [release-50]  # sync release-50 to master
+    * master: [release-51]  # sync release-51 to master
 
   -b|--base:
     The base branch of current working branch if currently is not
@@ -151,11 +151,11 @@ remote_refs() {
 upstream_branches() {
     local base="$1"
     case "$base" in
-        release-50)
+        release-51)
             remote_ref "$base"
             ;;
         master)
-            remote_refs "$base" 'release-50'
+            remote_refs "$base" 'release-51'
             ;;
     esac
 }