Merge pull request #245 from emqx/tag-1.2.3.3

merge branch tag-1.2.3.3
emqx · Jun 24, 2024 · 6e20cea · 6e20cea
2 parents 6cbf890 + fe9f237
commit 6e20cea
Show file tree

Hide file tree

Showing 3 changed files with 251 additions and 48 deletions.
diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml
@@ -48,8 +48,8 @@ jobs:
         - name: prepare
           run: |
             /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-            brew install curl zip unzip gnu-sed erlang@23
-            echo "$(brew --prefix)/opt/erlang@${{ matrix.otp }}/bin" >> $GITHUB_PATH
+            brew install curl zip unzip gnu-sed erlang@24
+            echo "$(brew --prefix)/opt/erlang@24/bin" >> $GITHUB_PATH
             echo "$(brew --prefix)/opt/unzip/bin" >> $GITHUB_PATH
             echo "$(brew --prefix)/bin" >> $GITHUB_PATH
         - name: install rebar3
@@ -59,7 +59,7 @@ jobs:
         - name: build
           run: |
             echo "${PATH}"
-            export PATH="/usr/local/opt/erlang@23/bin:$PATH"
+            export PATH="/usr/local/opt/erlang@24/bin:$PATH"
             erl -noshell -eval 'io:format(erlang:system_info(otp_release)), halt(0).'
             .github/workflows/script/build.sh
             pkg=emqtt-macos-$(git describe --tags --always).zip

diff --git a/src/emqtt.appup.src b/src/emqtt.appup.src
@@ -1,6 +1,9 @@
 %% -*-: erlang -*-
-{"1.2.3.3",
-  [ {"1.2.3.2", [
+{"1.2.3.4",
+  [ {"1.2.3.3", [
+     {load_module, emqtt, brutal_purge, soft_purge, []}
+    ]},
+   {"1.2.3.2", [
      {load_module, emqtt, brutal_purge, soft_purge, []}
     ]},
     {"1.2.3.1", [
@@ -20,7 +23,10 @@
      {load_module, emqtt_cli, brutal_purge, soft_purge, []}
     ]}
   ],
-  [{"1.2.3.2", [
+  [{"1.2.3.3", [
+     {load_module, emqtt, brutal_purge, soft_purge, []}
+    ]},
+  {"1.2.3.2", [
      {load_module, emqtt, brutal_purge, soft_purge, []}
     ]},
    {"1.2.3.1", [