Merge pull request #52 from zmstone/251216-build-on-otp-28

251216 build on otp 28

Author: zmstone

.github/workflows/run_test_case.yaml

@@ -7,10 +7,10 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/emqx/emqx-builder/5.3-9:1.15.7-26.2.5-3-ubuntu22.04
+            image: ghcr.io/emqx/emqx-builder/6.0-6:1.19.1-28.2-1-ubuntu22.04
 
         steps:
-        - uses: actions/checkout@v4.2.2
+        - uses: actions/checkout@v5.0.0
 
         - name: Compile
           run: |

rebar.config

@@ -40,9 +40,8 @@
             export_all,
             no_inline_list_funcs]},
         {deps, [
-            {eunit_formatters, "~> 0.3"},
-            {proper, {git, "https://github.com/proper-testing/proper.git", {tag, "v1.4"}}},
-            {meck, "0.9.2"}
+            {proper, {git, "https://github.com/proper-testing/proper.git", {tag, "v1.5.0"}}},
+            {meck, "1.1.0"}
         ]}
     ]}
 ]}.

rebar.config.script

@@ -105,11 +105,11 @@ eval_everywhere(Nodes, M, F, A, SendTimeout) ->
 yield(Key) ->
     gen_rpc_client:yield(Key).
 
--spec nb_yield(tuple()) -> {value, term()} | {badrpc, term()}.
+-spec nb_yield(tuple()) -> {value, term()} | {badrpc, term()} | timeout.
 nb_yield(Key) ->
     gen_rpc_client:nb_yield(Key).
 
--spec nb_yield(tuple(), timeout()) -> {value, term()} | {badrpc, term()}.
+-spec nb_yield(tuple(), timeout()) -> {value, term()} | {badrpc, term()} | timeout.
 nb_yield(Key, Timeout) ->
     gen_rpc_client:nb_yield(Key, Timeout).
 

src/gen_rpc.erl

@@ -320,6 +320,7 @@ build_old_rel(Tag, Config) ->
                   cd gen_rpc &&
                   git checkout '" ++ atom_to_list(Tag) ++ "' &&
                   sed -i 's/^\s*, {fail_if_no_peer_cert, true}/%&/' include/ssl.hrl &&
+                  sed -i 's|{snabbkaffe,.*}|{snabbkaffe, {git, \"https://github.com/kafka4beam/snabbkaffe\", {tag, \"1.0.10\"}}}|' rebar.config &&
                   env REBAR_PROFILE=default rebar3 compile &&
                   echo 'DONE'"),
     case lists:suffix("DONE\n", Ret) of