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

chore: v5.1.5-build.3

This commit is contained in:
Ivan Dyachkov 2023-08-10 12:20:17 +02:00
parent 6ead09b28d
commit 801c93dd46
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@
%% `apps/emqx/src/bpapi/README.md'
%% Opensource edition
-define(EMQX_RELEASE_CE, "5.1.5-patch.2").
-define(EMQX_RELEASE_CE, "5.1.5-build.3").
%% Enterprise edition
-define(EMQX_RELEASE_EE, "5.1.1").

2
apps/emqx/src/emqx.app.src
View File

@ -2,7 +2,7 @@
{application, emqx, [
{id, "emqx"},
{description, "EMQX Core"},
{vsn, "5.1.6"},
{vsn, "5.1.7"},
{modules, []},
{registered, []},
{applications, [

2
apps/emqx_conf/src/emqx_conf.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_conf, [
{description, "EMQX configuration management"},
{vsn, "0.1.25"},
{vsn, "0.1.26"},
{registered, []},
{mod, {emqx_conf_app, []}},
{applications, [kernel, stdlib, emqx_ctl]},

2
apps/emqx_machine/src/emqx_machine.app.src
View File

@ -3,7 +3,7 @@
{id, "emqx_machine"},
{description, "The EMQX Machine"},
% strict semver, bump manually!
{vsn, "0.2.10"},
{vsn, "0.2.11"},
{modules, []},
{registered, []},
{applications, [kernel, stdlib, emqx_ctl]},

2
build
View File

@ -382,7 +382,7 @@ make_docker() {
# shellcheck disable=SC2155
local VSN_MINOR="$(scripts/semver.sh "$PKG_VSN" --minor)"
# shellcheck disable=SC2155
local VSN_MINOR="$(scripts/semver.sh "$PKG_VSN" --patch)"
local VSN_PATCH="$(scripts/semver.sh "$PKG_VSN" --patch)"
local SUFFIX=''
if [[ "$PROFILE" = *-elixir ]]; then
SUFFIX="-elixir"

4
scripts/parse-git-ref.sh
View File

@ -20,7 +20,7 @@ if [[ $1 =~ ^refs/tags/v[5-9]+\.[0-9]+\.[0-9]+$ ]]; then
PROFILE=emqx
RELEASE=true
LATEST=$(is_latest "$1")
elif [[ $1 =~ ^refs/tags/v[5-9]+\.[0-9]+\.[0-9]+-patch\.[0-9]+$ ]]; then
elif [[ $1 =~ ^refs/tags/v[5-9]+\.[0-9]+\.[0-9]+-build\.[0-9]+$ ]]; then
PROFILE=emqx
RELEASE=true
LATEST=$(is_latest "$1")
@ -28,7 +28,7 @@ elif [[ $1 =~ ^refs/tags/e[5-9]+\.[0-9]+\.[0-9]+$ ]]; then
PROFILE=emqx-enterprise
RELEASE=true
LATEST=$(is_latest "$1")
elif [[ $1 =~ ^refs/tags/e[5-9]+\.[0-9]+\.[0-9]+-patch\.[0-9]+$ ]]; then
elif [[ $1 =~ ^refs/tags/e[5-9]+\.[0-9]+\.[0-9]+-build\.[0-9]+$ ]]; then
PROFILE=emqx-enterprise
RELEASE=true
LATEST=$(is_latest "$1")

18
scripts/semver.sh
View File

@ -6,21 +6,21 @@ function parseSemver() {
local RE='^([0-9]+)\.([0-9]+)\.([0-9]+)(-([a-z]+\.[0-9]+))?$'
echo "$1" | grep -qE "$RE" || exit 1
#shellcheck disable=SC2155
local MAJOR=$( echo "$1" | sed -r "s#$RE#\1#")
local MAJOR=$(echo "$1" | sed -r "s#$RE#\1#")
#shellcheck disable=SC2155
local MINOR=$( echo "$1" | sed -r "s#$RE#\2#")
local MINOR=$(echo "$1" | sed -r "s#$RE#\2#")
#shellcheck disable=SC2155
local PATCH=$( echo "$1" | sed -r "s#$RE#\3#")
local PATCH=$(echo "$1" | sed -r "s#$RE#\3#")
#shellcheck disable=SC2155
local SPECIAL=$(echo "$1" | sed -r "s#$RE#\5#")
local BUILD=$(echo "$1" | sed -r "s#$RE#\5#")
case "${2}" in
--major) echo "${MAJOR}" ;;
--minor) echo "${MINOR}" ;;
--patch) echo "${PATCH}" ;;
--special) echo "${SPECIAL}" ;;
--major) echo "${MAJOR}" ;;
--minor) echo "${MINOR}" ;;
--patch) echo "${PATCH}" ;;
--build) echo "${BUILD}" ;;
*)
cat <<EOF
{"major": ${MAJOR}, "minor": ${MINOR}, "patch": ${PATCH}, "special": "${SPECIAL}"}
{"major": ${MAJOR}, "minor": ${MINOR}, "patch": ${PATCH}, "build": "${BUILD}"}
EOF
;;
esac

4
scripts/shelltest/parse-git-ref.test
View File

@ -23,7 +23,7 @@ Unrecognized git ref: e5.2.0-1
{"profile": "emqx", "release": true, "latest": false}
>>>= 0
./parse-git-ref.sh refs/tags/v5.1.5-patch.1
./parse-git-ref.sh refs/tags/v5.1.5-build.1
>>>
{"profile": "emqx", "release": true, "latest": false}
>>>= 0
@ -53,7 +53,7 @@ Unrecognized tag: refs/tags/v5.2.0-alpha-1
{"profile": "emqx-enterprise", "release": true, "latest": false}
>>>= 0
./parse-git-ref.sh refs/tags/e5.1.5-patch.1
./parse-git-ref.sh refs/tags/e5.1.5-build.1
>>>
{"profile": "emqx-enterprise", "release": true, "latest": false}
>>>= 0

16
scripts/shelltest/semver.test
View File

@ -3,30 +3,30 @@
./semver.sh 5.1.0
>>>
{"major": 5, "minor": 1, "patch": 0, "special": ""}
{"major": 5, "minor": 1, "patch": 0, "build": ""}
>>>= 0
./semver.sh 5.1.0-patch.3
./semver.sh 5.1.0-build.3
>>>
{"major": 5, "minor": 1, "patch": 0, "special": "patch.3"}
{"major": 5, "minor": 1, "patch": 0, "build": "build.3"}
>>>= 0
./semver.sh 5.1.0-patch.3 --major
./semver.sh 5.1.0-build.3 --major
>>>
5
>>>= 0
./semver.sh 5.1.0-patch.3 --minor
./semver.sh 5.1.0-build.3 --minor
>>>
1
>>>= 0
./semver.sh 5.1.0-patch.3 --patch
./semver.sh 5.1.0-build.3 --patch
>>>
0
>>>= 0
./semver.sh 5.1.0-patch.3 --special
./semver.sh 5.1.0-build.3 --build
>>>
patch.3
build.3
>>>= 0