Merge pull request #9409 from rabbitmq/rin/match-rabbitmq_mqtt-bazel-make

Fix bazel/make discrepancies

Author: HoloRin

.github/workflows/check-build-system-equivalence.yaml

@@ -64,7 +64,7 @@ jobs:
     - name: UPLOAD package-generic-unix.tar.xz
       uses: actions/[email protected]
       with:
-        name: bazel-package-generic-unix.tar.xz
+        name: bazel-package-generic-unix-${{ env.VERSION }}.tar.xz
         path: ${{ env.archives_dir }}/package-generic-unix.tar.xz
         if-no-files-found: error
 
@@ -99,7 +99,7 @@ jobs:
     - name: UPLOAD package-generic-unix.tar.xz
       uses: actions/[email protected]
       with:
-        name: make-package-generic-unix.tar.xz
+        name: make-package-generic-unix-${{ env.VERSION }}.tar.xz
         path: PACKAGES/rabbitmq-server-generic-unix-*.tar.xz
         if-no-files-found: error
 
@@ -124,11 +124,11 @@ jobs:
     - name: DOWNLOAD bazel-package-generic-unix.tar.xz
       uses: actions/download-artifact@v3
       with:
-        name: bazel-package-generic-unix.tar.xz
+        name: bazel-package-generic-unix-${{ env.VERSION }}.tar.xz
     - name: DOWNLOAD make-package-generic-unix.tar.xz
       uses: actions/download-artifact@v3
       with:
-        name: make-package-generic-unix.tar.xz
+        name: make-package-generic-unix-${{ env.VERSION }}.tar.xz
     - name: EXPAND & COMPARE
       run: |
         mkdir bazel
@@ -145,8 +145,8 @@ jobs:
           find . | sort > ${{ github.workspace }}/make.manifest
         popd
 
-        tree -L 2 bazel
-        tree -L 2 make
+        tree -L 3 bazel
+        tree -L 3 make
 
         sleep 1
 

deps/rabbit/Makefile

@@ -151,7 +151,7 @@ PLT_APPS += mnesia
 dep_syslog = git https://github.com/schlagert/syslog 4.0.0
 dep_osiris = git https://github.com/rabbitmq/osiris v1.6.4
 dep_systemd = hex 0.6.1
-dep_seshat = hex 0.4.0
+dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
 
 define usage_xml_to_erl
 $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, src/rabbit_%_usage.erl, $(subst -,_,$(1))))

deps/rabbitmq_mqtt/Makefile

@@ -44,7 +44,7 @@ BUILD_WITHOUT_QUIC=1
 export BUILD_WITHOUT_QUIC
 
 LOCAL_DEPS = ssl
-DEPS = ranch rabbit_common rabbit ra
+DEPS = ranch rabbit_common rabbit ra amqp10_common
 TEST_DEPS = emqtt ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management rabbitmq_web_mqtt amqp_client rabbitmq_consistent_hash_exchange rabbitmq_amqp1_0 amqp10_client rabbitmq_stomp rabbitmq_stream
 
 dep_ct_helper = git https://github.com/extend/ct_helper.git master