From 5e67508033316af79156906bbf94a58215af4a35 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Mon, 13 Mar 2023 17:02:27 +0800 Subject: [PATCH 1/2] chore: fix typos --- .github/workflows/build_packages.yaml | 4 ++-- .github/workflows/build_slim_packages.yaml | 4 ++-- src/emqx_vm.erl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index bb7cd82cf..4cfa31466 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -93,9 +93,9 @@ jobs: ./_build/${{ matrix.profile }}/rel/emqx/bin/emqx stop echo "EMQX stopped" ./_build/${{ matrix.profile }}/rel/emqx/bin/emqx install - echo "EQMX installed" + echo "EMQX installed" ./_build/${{ matrix.profile }}/rel/emqx/bin/emqx uninstall - echo "EQMX uninstaled" + echo "EMQX uninstaled" - uses: actions/upload-artifact@v3 with: name: ${{ matrix.profile }} diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index bb1fca468..089be83a6 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -109,9 +109,9 @@ jobs: ./_build/${{ matrix.profile }}/rel/emqx/bin/emqx stop echo "EMQX stopped" ./_build/${{ matrix.profile }}/rel/emqx/bin/emqx install - echo "EQMX installed" + echo "EMQX installed" ./_build/${{ matrix.profile }}/rel/emqx/bin/emqx uninstall - echo "EQMX uninstaled" + echo "EMQX uninstaled" mac: strategy: diff --git a/src/emqx_vm.erl b/src/emqx_vm.erl index b62dba96a..295e4d927 100644 --- a/src/emqx_vm.erl +++ b/src/emqx_vm.erl @@ -380,7 +380,7 @@ read_otp_version() -> Filename = filename:join([ReleasesDir, emqx_app:get_release(), "BUILT_ON"]), case file:read_file(Filename) of {ok, BuiltOn} -> - %% running on EQMX release + %% running on EMQX release BuiltOn; {error, enoent} -> OtpMajor = erlang:system_info(otp_release), From 1b53274fbc14a3a2e0839a7647655d927df5c4c2 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Mon, 13 Mar 2023 17:29:20 +0800 Subject: [PATCH 2/2] chore: make xref happy --- src/emqx_relup.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/emqx_relup.erl b/src/emqx_relup.erl index b5290963c..ba74d7b46 100644 --- a/src/emqx_relup.erl +++ b/src/emqx_relup.erl @@ -124,7 +124,7 @@ maybe_start_schema_registry(_) -> ok. -endif. --compile([{nowarn_unused_function, [{do_when_vsn_lte, 4}]}]). +-ifdef(EMQX_ENTERPRISE). do_when_vsn_lte(SrcVsnStr, TargetVsn, ActionName, Action) -> try 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}]), ok end. +-endif.