From 899fc7b9b94b5921c3c90f378beb8ce98960f00c Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Fri, 1 Dec 2023 16:41:37 +0100 Subject: [PATCH 1/3] chore: bump ssl_verify_fun version to 1.1.7 --- mix.exs | 2 +- rebar.config | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mix.exs b/mix.exs index cd0424155..747f5a205 100644 --- a/mix.exs +++ b/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, diff --git a/rebar.config b/rebar.config index 5b05f25e9..e2cdf6018 100644 --- a/rebar.config +++ b/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, From 9c30a7bbe753fc0880b23c156fc41cc3dd5cd050 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Fri, 1 Dec 2023 16:41:56 +0100 Subject: [PATCH 2/3] chore: fail early in pre-compile.sh when translation file is not available --- scripts/pre-compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pre-compile.sh b/scripts/pre-compile.sh index 71b42d003..12506162c 100755 --- a/scripts/pre-compile.sh +++ b/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) From 0e27d031a8c730bbd5798b62c04022f59a5b992e Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Fri, 1 Dec 2023 15:50:56 +0100 Subject: [PATCH 3/3] chore: 5.4.0-alpha.1 --- apps/emqx/include/emqx_release.hrl | 4 ++-- deploy/charts/emqx-enterprise/Chart.yaml | 4 ++-- deploy/charts/emqx/Chart.yaml | 4 ++-- scripts/rel/cut.sh | 9 ++++++++- scripts/rel/sync-remotes.sh | 10 +++++++--- 5 files changed, 21 insertions(+), 10 deletions(-) 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 <