Merge pull request #8003 from rabbitmq/otp26-compatibility

OTP26 compatibility

Author: michaelklishin

.github/workflows/oci.yaml

@@ -34,9 +34,9 @@ jobs:
       matrix:
         include:
           - image_tag_suffix: otp-min-bazel
-            otp_version_id: 25_0
-          - image_tag_suffix: otp-max-bazel
             otp_version_id: 25_3
+          - image_tag_suffix: otp-max-bazel
+            otp_version_id: 26
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -76,7 +76,7 @@ jobs:
           echo "elixir=$(cat bazel-bin/elixir_version.txt)" >> $GITHUB_OUTPUT
 
       - name: Configure OTP & Elixir
-        uses: erlef/[email protected]
+        uses: erlef/[email protected].3
         with:
           otp-version: ${{ steps.load-info.outputs.otp }}
           elixir-version: ${{ steps.load-info.outputs.elixir }}

.github/workflows/test-windows.yaml

@@ -21,7 +21,7 @@ jobs:
     - name: CHECKOUT REPOSITORY
       uses: actions/checkout@v3
     - name: CONFIGURE ERLANG
-      uses: erlef/[email protected]
+      uses: erlef/[email protected].3
       with:
         otp-version: ${{ matrix.erlang_version }}
         elixir-version: ${{ matrix.elixir_version }}

MODULE.bazel

@@ -400,8 +400,8 @@ erlang_dev_package.hex_package(
 erlang_dev_package.git_package(
     name = "emqtt",
     build_file = "@rabbitmq-server//bazel:BUILD.emqtt",
-    repository = "emqx/emqtt",
-    tag = "1.8.2",
+    repository = "rabbitmq/emqtt",
+    branch = "otp-26-compatibility",
 )
 
 erlang_dev_package.git_package(

bazel/BUILD.emqtt

@@ -45,24 +45,9 @@ erlang_bytecode(
         "src/emqtt_sock.erl",
         "src/emqtt_ws.erl",
     ],
-    outs = [
-        "ebin/emqtt.beam",
-        "ebin/emqtt_cli.beam",
-        "ebin/emqtt_frame.beam",
-        "ebin/emqtt_inflight.beam",
-        "ebin/emqtt_props.beam",
-        "ebin/emqtt_quic.beam",
-        "ebin/emqtt_quic_connection.beam",
-        "ebin/emqtt_quic_stream.beam",
-        "ebin/emqtt_secret.beam",
-        "ebin/emqtt_sock.beam",
-        "ebin/emqtt_ws.beam",
-    ],
-    hdrs = [
-        "include/emqtt.hrl",
-        "include/logger.hrl",
-    ],
+    hdrs = [":public_and_private_hdrs"],
     app_name = "emqtt",
+    dest = "ebin",
     erlc_opts = "//:erlc_opts",
 )
 
@@ -94,6 +79,7 @@ filegroup(
 filegroup(
     name = "private_hdrs",
     testonly = True,
+    srcs = glob(["src/**/*.hrl"]),
 )
 
 filegroup(
@@ -108,6 +94,7 @@ filegroup(
 filegroup(
     name = "priv",
     testonly = True,
+    srcs = glob(["priv/**/*"]),
 )
 
 filegroup(
@@ -143,6 +130,8 @@ erlang_app(
     hdrs = [":public_hdrs"],
     app_name = "emqtt",
     beam_files = [":beam_files"],
+    license_files = [":license_files"],
+    priv = [":priv"],
     deps = [
         "@cowlib//:erlang_app",
         "@getopt//:erlang_app",
@@ -155,3 +144,9 @@ alias(
     actual = ":erlang_app",
     visibility = ["//visibility:public"],
 )
+
+filegroup(
+    name = "license_files",
+    testonly = True,
+    srcs = glob(["LICENSE*"]),
+)

deps/rabbit/src/rabbit_time_travel_dbg.erl

@@ -47,7 +47,7 @@ print() ->
     ok.
 
 stop() ->
-    dbg:stop_clear(),
+    dbg:stop(),
     ?MODULE ! stop,
     ok.
 

deps/rabbitmq_auth_backend_oauth2/Makefile

@@ -15,7 +15,7 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
 dep_jose = git https://github.com/michaelklishin/erlang-jose mk-thoas-support
 dep_base64url = hex 1.0.1
 
-dep_emqtt = git https://github.com/emqx/emqtt.git 1.8.2
+dep_emqtt = git https://github.com/rabbitmq/emqtt.git otp-26-compatibility
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk

deps/rabbitmq_mqtt/Makefile

@@ -43,7 +43,7 @@ DEPS = ranch rabbit_common rabbit amqp_client ra
 TEST_DEPS = emqtt ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management rabbitmq_web_mqtt
 
 dep_ct_helper = git https://github.com/extend/ct_helper.git master
-dep_emqtt = git https://github.com/emqx/emqtt.git 1.8.2
+dep_emqtt = git https://github.com/rabbitmq/emqtt.git otp-26-compatibility
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk