From 15b97ec78e32101382c5501267568e84bd9edf41 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 9 Aug 2022 10:28:55 +0200 Subject: [PATCH 1/3] chore: revert EMQX to EMQ X in emqx app desc --- src/emqx.app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emqx.app.src b/src/emqx.app.src index 6de9657d1..d5d335e45 100644 --- a/src/emqx.app.src +++ b/src/emqx.app.src @@ -1,6 +1,6 @@ {application, emqx, [{id, "emqx"}, - {description, "EMQX"}, + {description, "EMQ X"}, %% Note: this version is not the same as the release version! This %% is simply the emqx `application' version, which is separate from %% the emqx `release' version, which in turn is comprised of several From 8c08a374582c4ee8673594fb0cb69ba18ae638ca Mon Sep 17 00:00:00 2001 From: zhouzb Date: Wed, 10 Aug 2022 14:50:14 +0800 Subject: [PATCH 2/3] chore: change vsn to 4.4.7-beta.1 --- include/emqx_release.hrl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl index bf18338f6..48a596425 100644 --- a/include/emqx_release.hrl +++ b/include/emqx_release.hrl @@ -29,11 +29,10 @@ -ifndef(EMQX_ENTERPRISE). --define(EMQX_RELEASE, {opensource, "4.4.7"}). +-define(EMQX_RELEASE, {opensource, "4.4.7-beta.1"}). -else. - -endif. -endif. From e7f8e00aa4671b4ee4c9be5298dc8298c64e7848 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 10 Aug 2022 09:01:39 +0200 Subject: [PATCH 3/3] ci: remove -S option for env --- scripts/fail-on-old-otp-version.escript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/fail-on-old-otp-version.escript b/scripts/fail-on-old-otp-version.escript index c85e120ef..3081c0d29 100755 --- a/scripts/fail-on-old-otp-version.escript +++ b/scripts/fail-on-old-otp-version.escript @@ -1,4 +1,4 @@ -#!/usr/bin/env -S escript -c +#!/usr/bin/env escript -mode(compile).