Add a workflow to compare the bazel/erlang.mk output

To catch any drift between the builds
rabbitmq · May 15, 2023 · eb94a58 · eb94a58
1 parent 1ee8454
commit eb94a58
Show file tree

Hide file tree

Showing 29 changed files with 315 additions and 62 deletions.
diff --git a/.github/workflows/check-build-system-equivalence.yaml b/.github/workflows/check-build-system-equivalence.yaml
@@ -0,0 +1,125 @@
+name: Check Bazel/Erlang.mk Equivalence
+on:
+  schedule:
+  - cron: '0 2 * * *'
+  workflow_dispatch:
+env:
+  erlang_version: 25.3
+  elixir_version: 1.14
+  VERSION: 3.13.0
+  PLUGINS: amqp10_common amqp10_client rabbitmq_amqp1_0 rabbitmq_auth_backend_cache rabbitmq_auth_backend_http rabbitmq_auth_backend_ldap rabbitmq_auth_backend_oauth2 rabbitmq_auth_mechanism_ssl rabbitmq_consistent_hash_exchange rabbitmq_event_exchange rabbitmq_federation rabbitmq_jms_topic_exchange rabbitmq_mqtt rabbitmq_random_exchange rabbitmq_recent_history_exchange rabbitmq_sharding rabbitmq_shovel rabbitmq_stomp rabbitmq_stream rabbitmq_trust_store rabbitmq_web_dispatch rabbitmq_management_agent rabbitmq_management rabbitmq_prometheus rabbitmq_federation_management rabbitmq_shovel_management rabbitmq_stream_management rabbitmq_top rabbitmq_tracing rabbitmq_web_mqtt rabbitmq_web_mqtt_examples rabbitmq_web_stomp rabbitmq_web_stomp_examples rabbitmq_aws rabbitmq_peer_discovery_common rabbitmq_peer_discovery_aws rabbitmq_peer_discovery_k8s rabbitmq_peer_discovery_consul rabbitmq_peer_discovery_etcd
+jobs:
+  build-with-bazel:
+    name: bazel build package-generic-unix.tar.xz
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+    - name: CHECKOUT REPOSITORY
+      uses: actions/checkout@v3
+    - name: CONFIGURE ERLANG
+      uses: erlef/[email protected]
+      with:
+        otp-version: ${{ env.erlang_version }}
+        elixir-version: ${{ env.elixir_version }}
+    - name: CONFIGURE BAZEL
+      run: |
+        cat << EOF >> user.bazelrc
+          build --disk_cache=
+          build --color=yes
+        EOF
+    - name: BUILD package-generic-unix.tar.xz
+      run: |
+        bazelisk build //:package-generic-unix
+    - name: RESOLVE ARCHIVES_DIR
+      run: |
+        echo "archives_dir=$(readlink -f bazel-bin)" >> $GITHUB_ENV
+    - name: UPLOAD package-generic-unix.tar.xz
+      uses: actions/[email protected]
+      with:
+        name: bazel-package-generic-unix.tar.xz
+        path: ${{ env.archives_dir }}/package-generic-unix.tar.xz
+        if-no-files-found: error
+
+  build-with-make:
+    name: make package-generic-unix.tar.xz
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+    - name: CHECKOUT REPOSITORY
+      uses: actions/checkout@v3
+      with:
+        path: rabbitmq
+    - name: CONFIGURE ERLANG
+      uses: erlef/[email protected]
+      with:
+        otp-version: ${{ env.erlang_version }}
+        elixir-version: ${{ env.elixir_version }}
+    - name: BUILD package-generic-unix.tar.xz
+      env:
+        MAKE: make
+      run: |
+        $MAKE -C rabbitmq \
+          source-dist \
+          PACKAGES_DIR="$PWD/PACKAGES" \
+          PLUGINS="$PLUGINS" \
+          PROJECT_VERSION="$VERSION"
+        $MAKE -C rabbitmq/packaging \
+          package-generic-unix \
+          PACKAGES_DIR="$PWD/PACKAGES" \
+          VERSION="$VERSION"
+    - name: UPLOAD package-generic-unix.tar.xz
+      uses: actions/[email protected]
+      with:
+        name: make-package-generic-unix.tar.xz
+        path: PACKAGES/rabbitmq-server-generic-unix-*.tar.xz
+        if-no-files-found: error
+
+  compare:
+    needs:
+    - build-with-bazel
+    - build-with-make
+    name: Compare package-generic-unix.tar.xz
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+    - name: CHECKOUT REPOSITORY
+      uses: actions/checkout@v3
+      with:
+        path: rabbitmq-server
+    - name: CONFIGURE ERLANG
+      uses: erlef/[email protected]
+      with:
+        otp-version: ${{ env.erlang_version }}
+        elixir-version: ${{ env.elixir_version }}
+    - name: DOWNLOAD bazel-package-generic-unix.tar.xz
+      uses: actions/download-artifact@v3
+      with:
+        name: bazel-package-generic-unix.tar.xz
+    - name: DOWNLOAD make-package-generic-unix.tar.xz
+      uses: actions/download-artifact@v3
+      with:
+        name: make-package-generic-unix.tar.xz
+    - name: EXPAND & COMPARE
+      run: |
+        mkdir bazel
+        pushd bazel
+          tar -xf ${{ github.workspace }}/package-generic-unix.tar.xz
+          find . | sort > ${{ github.workspace }}/bazel.manifest
+        popd
+
+        mkdir make
+        pushd make
+          tar -xf ${{ github.workspace }}/rabbitmq-server-generic-unix-*.tar.xz
+          # delete an empty directory
+          rm -d rabbitmq_server-*/plugins/rabbitmq_random_exchange-*/include
+          find . | sort > ${{ github.workspace }}/make.manifest
+        popd
+
+        tree -L 2 bazel
+        tree -L 2 make
+
+        sleep 1
+
+        set -x
+
+        ./rabbitmq-server/tools/compare_dist.sh make bazel
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -69,8 +69,11 @@ exports_files([
 # gazelle:exclude deps/*/deps
 # gazelle:exclude deps/*/.erlang.mk
 # gazelle:exclude deps/rabbitmq_cli/_build
+# gazelle:exclude extra_deps
 # gazelle:exclude packaging
 # gazelle:exclude PACKAGES
+# gazelle:exclude plugins
+# gazelle:exclude release-notes
 # gazelle:exclude logs
 # gazelle:erlang_apps_dirs deps
 # gazelle:erlang_skip_rules test_erlang_app
@@ -217,13 +220,7 @@ iex_eval(
 
 filegroup(
     name = "root-licenses",
-    srcs = glob(
-        ["LICENSE*"],
-        exclude = [
-            "LICENSE.md",
-            "LICENSE.txt",
-        ],
-    ),
+    srcs = glob(["LICENSE*"]),
     visibility = ["//visibility:public"],
 )
 

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -207,8 +207,8 @@ erlang_package.hex_package(
 erlang_package.hex_package(
     name = "gen_batch_server",
     build_file = "@rabbitmq-server//bazel:BUILD.gen_batch_server",
-    sha256 = "94a49a528486298b009d2a1b452132c0a0d68b3e89d17d3764cb1ec879b7557a",
-    version = "0.8.7",
+    sha256 = "c3e6a1a2a0fb62aee631a98cfa0fd8903e9562422cbf72043953e2fb1d203017",
+    version = "0.8.8",
 )
 
 erlang_package.hex_package(

diff --git a/bazel/BUILD.ranch b/bazel/BUILD.ranch
@@ -17,10 +17,12 @@ erlc_opts(
 
 erlang_bytecode(
     name = "behaviours",
-    srcs = ["src/ranch_transport.erl"],
-    outs = ["ebin/ranch_transport.beam"],
-    hdrs = [],
+    srcs = [
+        "src/ranch_transport.erl",
+    ],
+    hdrs = [":public_and_private_hdrs"],
     app_name = "ranch",
+    dest = "ebin",
     erlc_opts = "//:erlc_opts",
 )
 
@@ -44,27 +46,10 @@ erlang_bytecode(
         "src/ranch_sup.erl",
         "src/ranch_tcp.erl",
     ],
-    outs = [
-        "ebin/ranch.beam",
-        "ebin/ranch_acceptor.beam",
-        "ebin/ranch_acceptors_sup.beam",
-        "ebin/ranch_app.beam",
-        "ebin/ranch_conns_sup.beam",
-        "ebin/ranch_conns_sup_sup.beam",
-        "ebin/ranch_crc32c.beam",
-        "ebin/ranch_embedded_sup.beam",
-        "ebin/ranch_listener_sup.beam",
-        "ebin/ranch_protocol.beam",
-        "ebin/ranch_proxy_header.beam",
-        "ebin/ranch_server.beam",
-        "ebin/ranch_server_proxy.beam",
-        "ebin/ranch_ssl.beam",
-        "ebin/ranch_sup.beam",
-        "ebin/ranch_tcp.beam",
-    ],
-    hdrs = [],
+    hdrs = [":public_and_private_hdrs"],
     app_name = "ranch",
     beam = [":behaviours"],
+    dest = "ebin",
     erlc_opts = "//:erlc_opts",
 )
 
@@ -99,19 +84,15 @@ filegroup(
     ],
 )
 
-filegroup(
-    name = "private_hdrs",
-    srcs = [],
-)
+filegroup(name = "private_hdrs")
 
-filegroup(
-    name = "public_hdrs",
-    srcs = [],
-)
+filegroup(name = "public_hdrs")
 
 filegroup(
     name = "priv",
-    srcs = [],
+    srcs = [
+        "ebin/ranch.appup",  # keep
+    ],
 )
 
 filegroup(
@@ -138,13 +119,23 @@ filegroup(
 erlang_app(
     name = "erlang_app",
     srcs = [":all_srcs"],
+    hdrs = [":public_hdrs"],
     app_name = "ranch",
     beam_files = [":beam_files"],
     extra_apps = ["ssl"],
+    license_files = [":license_files"],
+    priv = [":priv"],
 )
 
 alias(
     name = "ranch",
     actual = ":erlang_app",
     visibility = ["//visibility:public"],
 )
+
+filegroup(
+    name = "license_files",
+    srcs = [
+        "LICENSE",
+    ],
+)
diff --git a/deps/amqp10_client/BUILD.bazel b/deps/amqp10_client/BUILD.bazel
@@ -28,7 +28,7 @@ APP_EXTRA_KEYS = """%% Hex.pm package informations.
 	{licenses, ["MPL-2.0"]},
 	{links, [
 	    {"Website", "https://www.rabbitmq.com/"},
-	    {"GitHub", "https://github.com/rabbitmq/rabbitmq-server/deps/amqp10_client"}
+	    {"GitHub", "https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/amqp10_client"}
 	  ]},
 	{build_tools, ["make", "rebar3"]},
 	{files, [

diff --git a/deps/amqp10_client/Makefile b/deps/amqp10_client/Makefile
@@ -31,7 +31,7 @@ PACKAGES_DIR ?= $(abspath PACKAGES)
 BUILD_DEPS = rabbit_common elvis_mk
 DEPS = amqp10_common
 TEST_DEPS = rabbit rabbitmq_amqp1_0 rabbitmq_ct_helpers
-LOCAL_DEPS = ssl inets crypto
+LOCAL_DEPS = ssl inets crypto public_key
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-test.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-macros.mk \

diff --git a/deps/amqp10_common/BUILD.bazel b/deps/amqp10_common/BUILD.bazel
@@ -54,7 +54,7 @@ APP_EXTRA_KEYS = """%% Hex.pm package informations.
     {licenses, ["MPL-2.0"]},
     {links, [
         {"Website", "https://www.rabbitmq.com/"},
-        {"GitHub", "https://github.com/rabbitmq/rabbitmq-server/deps/amqp10_common"}
+        {"GitHub", "https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/amqp10_common"}
     ]},
     {build_tools, ["make", "rebar3"]},
     {files, [
@@ -66,7 +66,7 @@ APP_EXTRA_KEYS = """%% Hex.pm package informations.
         "rabbitmq-components.mk",
         "README",
         "README.md",
-        "mk"
+        "src"
     ]}
 """
 

diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel
@@ -1140,16 +1140,16 @@ genrule(
     outs = ["manpages.tar"],
     cmd = """set -euo pipefail
 
-DESTDIR=manpages-tmp/share/man
+DESTDIR=share/man
 mkdir -p $${DESTDIR}
 for mp in $(SRCS); do
     section=$${mp##*.}
     mkdir -p $${DESTDIR}/man$$section
     gzip < $$mp \\
         > $${DESTDIR}/man$$section/$$(basename $$mp).gz
 done
-tar --strip-components 1 -cf $@ manpages-tmp/*
-rm -dr manpages-tmp
+tar -cf $@ share
+rm -dr share
 """,
     visibility = ["//visibility:public"],
 )

diff --git a/deps/rabbit/app.bzl b/deps/rabbit/app.bzl
@@ -501,10 +501,7 @@ def all_srcs(name = "all_srcs"):
 
     filegroup(
         name = "priv",
-        srcs = [
-            "priv/schema/.gitignore",
-            "priv/schema/rabbit.schema",
-        ],
+        srcs = ["priv/schema/rabbit.schema"],  #keep
     )
     filegroup(
         name = "private_hdrs",

diff --git a/deps/rabbit_common/Makefile b/deps/rabbit_common/Makefile
@@ -28,7 +28,7 @@ endef
 LOCAL_DEPS = compiler crypto public_key sasl ssl syntax_tools tools xmerl
 DEPS = thoas recon credentials_obfuscation
 
-dep_credentials_obfuscation = hex 3.2.0
+dep_credentials_obfuscation = hex 3.4.0
 
 # Variables and recipes in development.*.mk are meant to be used from
 # any Git clone. They are excluded from the files published to Hex.pm.

diff --git a/deps/rabbitmq_auth_backend_http/BUILD.bazel b/deps/rabbitmq_auth_backend_http/BUILD.bazel
@@ -20,7 +20,9 @@ load(
 )
 
 APP_ENV = """[
-	    {http_method,   get},
+	    {http_method,   	 get},
+	    {request_timeout,    15000},
+	    {connection_timeout, 15000},
 	    {user_path,     "http://localhost:8000/auth/user"},
 	    {vhost_path,    "http://localhost:8000/auth/vhost"},
 	    {resource_path, "http://localhost:8000/auth/resource"},

diff --git a/deps/rabbitmq_auth_backend_ldap/Makefile b/deps/rabbitmq_auth_backend_ldap/Makefile
@@ -34,7 +34,7 @@ define PROJECT_APP_EXTRA_KEYS
 	{broker_version_requirements, []}
 endef
 
-LOCAL_DEPS = eldap
+LOCAL_DEPS = eldap public_key
 DEPS = rabbit_common rabbit
 TEST_DEPS = ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client
 dep_ct_helper = git https://github.com/extend/ct_helper.git master

diff --git a/deps/rabbitmq_auth_backend_oauth2/Makefile b/deps/rabbitmq_auth_backend_oauth2/Makefile
@@ -5,6 +5,7 @@ PROJECT_DESCRIPTION = OAuth 2 and JWT-based AuthN and AuthZ backend
 BUILD_WITHOUT_QUIC=1
 export BUILD_WITHOUT_QUIC
 
+LOCAL_DEPS = inets public_key
 BUILD_DEPS = rabbit_common
 DEPS = rabbit cowlib jose base64url
 TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_mqtt emqtt

diff --git a/deps/rabbitmq_auth_mechanism_ssl/Makefile b/deps/rabbitmq_auth_mechanism_ssl/Makefile
@@ -12,6 +12,7 @@ define PROJECT_APP_EXTRA_KEYS
 	{broker_version_requirements, []}
 endef
 
+LOCAL_DEPS = public_key
 DEPS = rabbit_common rabbit
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk

diff --git a/deps/rabbitmq_aws/Makefile b/deps/rabbitmq_aws/Makefile
@@ -7,7 +7,7 @@ define PROJECT_ENV
 []
 endef
 
-LOCAL_DEPS = crypto inets ssl xmerl
+LOCAL_DEPS = crypto inets ssl xmerl public_key
 BUILD_DEPS = rabbit_common
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
 TEST_DEPS = meck

diff --git a/deps/rabbitmq_federation_management/Makefile b/deps/rabbitmq_federation_management/Makefile
@@ -5,7 +5,7 @@ define PROJECT_APP_EXTRA_KEYS
 	{broker_version_requirements, []}
 endef
 
-DEPS = rabbit_common rabbit rabbitmq_management rabbitmq_federation
+DEPS = amqp_client rabbit_common rabbit rabbitmq_management rabbitmq_federation
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
 
 DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk

diff --git a/deps/rabbitmq_jms_topic_exchange/Makefile b/deps/rabbitmq_jms_topic_exchange/Makefile
@@ -1,6 +1,7 @@
 PROJECT = rabbitmq_jms_topic_exchange
 PROJECT_DESCRIPTION = RabbitMQ JMS topic selector exchange plugin
 
+LOCAL_DEPS = mnesia
 DEPS = rabbit_common rabbit
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client