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

Merge pull request #11238 from ieQu1/customer-e502/patch 

chore(ekka): Update version to 0.15.5
This commit is contained in:
ieQu1 2023-07-12 16:50:33 +02:00 committed by GitHub
parent 6c36152612 2808523419
commit f37d9739a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_packages.yaml vendored
View File

@ -104,7 +104,7 @@ jobs:
- name: unzip source code - name: unzip source code
run: Expand-Archive -Path source.zip -DestinationPath ./ run: Expand-Archive -Path source.zip -DestinationPath ./
- uses: ilammy/msvc-dev-cmd@v1.12.0 - uses: ilammy/msvc-dev-cmd@v1.12.0
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.16.0
with: with:
otp-version: 24.3.4.6 otp-version: 24.3.4.6
- name: build - name: build

2
.github/workflows/build_slim_packages.yaml vendored
View File

@ -96,7 +96,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: ilammy/msvc-dev-cmd@v1.12.0 - uses: ilammy/msvc-dev-cmd@v1.12.0
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.16.0
with: with:
otp-version: ${{ matrix.otp }} otp-version: ${{ matrix.otp }}
- name: build - name: build

4
.github/workflows/run_fvt_tests.yaml vendored
View File

@ -58,7 +58,7 @@ jobs:
arch: arch:
- amd64 - amd64
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.16.0
with: with:
otp-version: 24.3.4.6 otp-version: 24.3.4.6
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
@ -133,7 +133,7 @@ jobs:
# - emqx-enterprise # TODO test enterprise # - emqx-enterprise # TODO test enterprise
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.16.0
with: with:
otp-version: 24.3.4.6 otp-version: 24.3.4.6
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3

12
.github/workflows/run_jmeter_tests.yaml vendored
View File

@ -14,7 +14,7 @@ jobs:
outputs: outputs:
version: ${{ steps.build_docker.outputs.version}} version: ${{ steps.build_docker.outputs.version}}
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.16.0
with: with:
otp-version: 24.3.4.6 otp-version: 24.3.4.6
- name: download jmeter - name: download jmeter
@ -57,7 +57,7 @@ jobs:
needs: build_emqx_for_jmeter_tests needs: build_emqx_for_jmeter_tests
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.16.0
with: with:
otp-version: 24.3.4.6 otp-version: 24.3.4.6
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -153,7 +153,7 @@ jobs:
needs: build_emqx_for_jmeter_tests needs: build_emqx_for_jmeter_tests
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.16.0
with: with:
otp-version: 24.3.4.6 otp-version: 24.3.4.6
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -259,7 +259,7 @@ jobs:
needs: build_emqx_for_jmeter_tests needs: build_emqx_for_jmeter_tests
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.16.0
with: with:
otp-version: 24.3.4.6 otp-version: 24.3.4.6
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -361,7 +361,7 @@ jobs:
needs: build_emqx_for_jmeter_tests needs: build_emqx_for_jmeter_tests
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.16.0
with: with:
otp-version: 24.3.4.6 otp-version: 24.3.4.6
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -460,7 +460,7 @@ jobs:
needs: build_emqx_for_jmeter_tests needs: build_emqx_for_jmeter_tests
steps: steps:
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.16.0
with: with:
otp-version: 24.3.4.6 otp-version: 24.3.4.6
- uses: actions/checkout@v3 - uses: actions/checkout@v3

2
.github/workflows/run_relup_tests.yaml vendored
View File

@ -71,7 +71,7 @@ jobs:
shell: bash shell: bash
steps: steps:
# setup Erlang to run lux # setup Erlang to run lux
- uses: erlef/setup-beam@v1.15.2 - uses: erlef/setup-beam@v1.16.0
with: with:
otp-version: 24.3.4.6 otp-version: 24.3.4.6
- uses: actions/checkout@v3 - uses: actions/checkout@v3

7
apps/emqx/include/emqx.hrl
View File

@ -25,13 +25,6 @@
-define(ROUTE_SHARD, route_shard). -define(ROUTE_SHARD, route_shard).
-define(PERSISTENT_SESSION_SHARD, emqx_persistent_session_shard). -define(PERSISTENT_SESSION_SHARD, emqx_persistent_session_shard).
-define(BOOT_SHARDS, [
?ROUTE_SHARD,
?COMMON_SHARD,
?SHARED_SUB_SHARD,
?PERSISTENT_SESSION_SHARD
]).
%% Banner %% Banner
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------

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

@ -35,7 +35,7 @@
-define(EMQX_RELEASE_CE, "5.0.21"). -define(EMQX_RELEASE_CE, "5.0.21").
%% Enterprise edition %% Enterprise edition
-define(EMQX_RELEASE_EE, "5.0.2-patch-00"). -define(EMQX_RELEASE_EE, "5.0.2-patch-01").
%% the HTTP API version %% the HTTP API version
-define(EMQX_API_VERSION, "5.0"). -define(EMQX_API_VERSION, "5.0").

2
apps/emqx/rebar.config
View File

@ -27,7 +27,7 @@
{jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}, {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}},
{cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}}, {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}},
{esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.4"}}}, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.4"}}},
{ekka, {git, "https://github.com/emqx/ekka", {tag, "0.14.5"}}}, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.5"}}},
{gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}}, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}},
{hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.37.2"}}}, {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.37.2"}}},
{emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}}, {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.5.2"}}},

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

@ -3,7 +3,7 @@
{id, "emqx"}, {id, "emqx"},
{description, "EMQX Core"}, {description, "EMQX Core"},
% strict semver, bump manually! % strict semver, bump manually!
{vsn, "5.0.21"}, {vsn, "5.0.22"},
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [ {applications, [

4
apps/emqx/src/emqx_app.erl
View File

@ -44,7 +44,6 @@ start(_Type, _Args) ->
ok = emqx_persistent_session:init_db_backend(), ok = emqx_persistent_session:init_db_backend(),
ok = maybe_start_quicer(), ok = maybe_start_quicer(),
ok = emqx_bpapi:start(), ok = emqx_bpapi:start(),
wait_boot_shards(),
ok = emqx_alarm_handler:load(), ok = emqx_alarm_handler:load(),
{ok, Sup} = emqx_sup:start_link(), {ok, Sup} = emqx_sup:start_link(),
ok = maybe_start_listeners(), ok = maybe_start_listeners(),
@ -60,9 +59,6 @@ prep_stop(_State) ->
stop(_State) -> ok. stop(_State) -> ok.
wait_boot_shards() ->
ok = mria_rlog:wait_for_shards(?BOOT_SHARDS, infinity).
%% @doc Call this function to make emqx boot without loading config, %% @doc Call this function to make emqx boot without loading config,
%% in case we want to delegate the config load to a higher level app %% in case we want to delegate the config load to a higher level app
%% which manages emqx app. %% which manages emqx app.

1
apps/emqx_machine/src/emqx_machine_boot.erl
View File

@ -148,6 +148,7 @@ basic_reboot_apps() ->
emqx_plugins emqx_plugins
] ++ basic_reboot_apps_enterprise(emqx_release:edition()). ] ++ basic_reboot_apps_enterprise(emqx_release:edition()).
-dialyzer({nowarn_function, basic_reboot_apps_enterprise/1}).
basic_reboot_apps_enterprise(ee) -> basic_reboot_apps_enterprise(ee) ->
[emqx_license]; [emqx_license];
basic_reboot_apps_enterprise(_) -> basic_reboot_apps_enterprise(_) ->

2
mix.exs
View File

@ -54,7 +54,7 @@ defmodule EMQXUmbrella.MixProject do
{:cowboy, github: "emqx/cowboy", tag: "2.9.0", override: true}, {:cowboy, github: "emqx/cowboy", tag: "2.9.0", override: true},
{:esockd, github: "emqx/esockd", tag: "5.9.4", override: true}, {:esockd, github: "emqx/esockd", tag: "5.9.4", override: true},
{:rocksdb, github: "emqx/erlang-rocksdb", tag: "1.7.2-emqx-9", override: true}, {:rocksdb, github: "emqx/erlang-rocksdb", tag: "1.7.2-emqx-9", override: true},
{:ekka, github: "emqx/ekka", tag: "0.14.5", override: true}, {:ekka, github: "emqx/ekka", tag: "0.15.5", override: true},
{:gen_rpc, github: "emqx/gen_rpc", tag: "2.8.1", override: true}, {:gen_rpc, github: "emqx/gen_rpc", tag: "2.8.1", override: true},
{:grpc, github: "emqx/grpc-erl", tag: "0.6.7", override: true}, {:grpc, github: "emqx/grpc-erl", tag: "0.6.7", override: true},
{:minirest, github: "emqx/minirest", tag: "1.3.8", override: true}, {:minirest, github: "emqx/minirest", tag: "1.3.8", override: true},

2
rebar.config
View File

@ -56,7 +56,7 @@
, {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}} , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}}
, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.4"}}} , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.4"}}}
, {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.7.2-emqx-9"}}} , {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.7.2-emqx-9"}}}
, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.14.5"}}} , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.5"}}}
, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}} , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}}
, {grpc, {git, "https://github.com/emqx/grpc-erl", {tag, "0.6.7"}}} , {grpc, {git, "https://github.com/emqx/grpc-erl", {tag, "0.6.7"}}}
, {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.3.8"}}} , {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.3.8"}}}