Merge pull request #12077 from id/1201-cut-5.4.0-alpha.1

chore: 5.4.0-alpha.1

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").

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

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

mix.exs

@@ -96,7 +96,7 @@ defmodule EMQXUmbrella.MixProject do
       {:gpb, "4.19.9", override: true, runtime: false},
       {:hackney, github: "emqx/hackney", tag: "1.18.1-1", override: true},
       # set by hackney (dependency)
-      {:ssl_verify_fun, "1.1.6", override: true},
+      {:ssl_verify_fun, "1.1.7", override: true},
       {:uuid, github: "okeuday/uuid", tag: "v2.0.6", override: true},
       {:quickrand, github: "okeuday/quickrand", tag: "v2.0.6", override: true},
       {:opentelemetry_api,

rebar.config

@@ -92,6 +92,7 @@
     , {opentelemetry_api_experimental, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.4.2-emqx"}, "apps/opentelemetry_api_experimental"}}
     %% export
     , {opentelemetry_exporter, {git_subdir, "https://github.com/emqx/opentelemetry-erlang", {tag, "v1.4.2-emqx"}, "apps/opentelemetry_exporter"}}
+    , {ssl_verify_fun, "1.1.7"}
     ]}.
 
 {xref_ignores,

scripts/pre-compile.sh

@@ -32,7 +32,7 @@ DOWNLOAD_I18N_TRANSLATIONS=${DOWNLOAD_I18N_TRANSLATIONS:-true}
 if [ "$DOWNLOAD_I18N_TRANSLATIONS" = "true" ]; then
   echo "downloading i18n translation from emqx/emqx-i18n"
   start=$(date +%s)
-  curl -L --silent --show-error \
+  curl -L --fail --silent --show-error \
        --output "apps/emqx_dashboard/priv/desc.zh.hocon" \
        "https://raw.githubusercontent.com/emqx/emqx-i18n/${I18N_REPO_BRANCH}/desc.zh.hocon"
   end=$(date +%s)

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

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 <<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
 }