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

Merge pull request #10120 from JimMoen/fix-typos 

chore: fix typos
This commit is contained in:
JimMoen 2023-03-13 18:15:23 +08:00 committed by GitHub
parent 2ea29feeb7 1b53274fbc
commit 4adb7dafcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,9 +93,9 @@ jobs:
./_build/${{ matrix.profile }}/rel/emqx/bin/emqx stop ./_build/${{ matrix.profile }}/rel/emqx/bin/emqx stop
echo "EMQX stopped" echo "EMQX stopped"
./_build/${{ matrix.profile }}/rel/emqx/bin/emqx install ./_build/${{ matrix.profile }}/rel/emqx/bin/emqx install
echo "EQMX installed" echo "EMQX installed"
./_build/${{ matrix.profile }}/rel/emqx/bin/emqx uninstall ./_build/${{ matrix.profile }}/rel/emqx/bin/emqx uninstall
echo "EQMX uninstaled" echo "EMQX uninstaled"
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: ${{ matrix.profile }} name: ${{ matrix.profile }}

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

@ -109,9 +109,9 @@ jobs:
./_build/${{ matrix.profile }}/rel/emqx/bin/emqx stop ./_build/${{ matrix.profile }}/rel/emqx/bin/emqx stop
echo "EMQX stopped" echo "EMQX stopped"
./_build/${{ matrix.profile }}/rel/emqx/bin/emqx install ./_build/${{ matrix.profile }}/rel/emqx/bin/emqx install
echo "EQMX installed" echo "EMQX installed"
./_build/${{ matrix.profile }}/rel/emqx/bin/emqx uninstall ./_build/${{ matrix.profile }}/rel/emqx/bin/emqx uninstall
echo "EQMX uninstaled" echo "EMQX uninstaled"
mac: mac:
strategy: strategy:

3
src/emqx_relup.erl
View File

@ -124,7 +124,7 @@ maybe_start_schema_registry(_) ->
ok. ok.
-endif. -endif.
-compile([{nowarn_unused_function, [{do_when_vsn_lte, 4}]}]). -ifdef(EMQX_ENTERPRISE).
do_when_vsn_lte(SrcVsnStr, TargetVsn, ActionName, Action) -> do_when_vsn_lte(SrcVsnStr, TargetVsn, ActionName, Action) ->
try try
case list_to_integer(SrcVsnStr) of case list_to_integer(SrcVsnStr) of
@ -139,3 +139,4 @@ do_when_vsn_lte(SrcVsnStr, TargetVsn, ActionName, Action) ->
?INFO("~p failed: ~p", [ActionName, {Err, Reason, ST}]), ?INFO("~p failed: ~p", [ActionName, {Err, Reason, ST}]),
ok ok
end. end.
-endif.

2
src/emqx_vm.erl
View File

@ -380,7 +380,7 @@ read_otp_version() ->
Filename = filename:join([ReleasesDir, emqx_app:get_release(), "BUILT_ON"]), Filename = filename:join([ReleasesDir, emqx_app:get_release(), "BUILT_ON"]),
case file:read_file(Filename) of case file:read_file(Filename) of
{ok, BuiltOn} -> {ok, BuiltOn} ->
%% running on EQMX release %% running on EMQX release
BuiltOn; BuiltOn;
{error, enoent} -> {error, enoent} ->
OtpMajor = erlang:system_info(otp_release), OtpMajor = erlang:system_info(otp_release),