From 5f4ca99421f7adc7c02182a71d29d89d0b8d0364 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Thu, 6 Nov 2025 14:51:53 -0800 Subject: [PATCH 1/2] Fix rabbit_common, amqp_client, amqp10_client publishing to hex.pm HEX_TARBALL_FILES included ../../rabbitmq-components.mk which modern `rebar3 compile` considers to be unsafe and fails on (quite reasonably). FTR, the error looks like this: ```` ===> Fetching rebar_alias v0.2.0 ===> Analyzing applications... ===> Compiling rebar_alias ===> Verifying dependencies... ===> Fetching amqp_client v4.1.5 escript: exception error: no function clause matching rebar_fetch:format_error({error, {hex_tarball, {inner_tarball, {"../../rabbitmq-components.mk", unsafe_path}}}}) (/home/runner/work/rebar3/rebar3/apps/rebar/src/rebar_fetch.erl, line 99) in function rebar3:handle_error/2 (/home/runner/work/rebar3/rebar3/apps/rebar/src/rebar3.erl, line 383) in call from escript:run/2 (escript.erl, line 904) in call from escript:start/1 (escript.erl, line 418) in call from init:start_it/1 in call from init:start_em/1 in call from init:do_boot/3 ``` Excluding this relative path addresses the issue. rabbit_common/Makefile arguably does not need to add any .mk files to the tarball but let's deal with that in a separate change. --- deps/amqp10_client/Makefile | 3 +-- deps/amqp10_common/Makefile | 3 +-- deps/amqp_client/Makefile | 3 +-- deps/rabbit_common/Makefile | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/deps/amqp10_client/Makefile b/deps/amqp10_client/Makefile index 6dfd95155f23..31840086eea9 100644 --- a/deps/amqp10_client/Makefile +++ b/deps/amqp10_client/Makefile @@ -44,8 +44,7 @@ dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master include ../../rabbitmq-components.mk include ../../erlang.mk -HEX_TARBALL_FILES += ../../rabbitmq-components.mk \ - git-revisions.txt +HEX_TARBALL_FILES += git-revisions.txt # -------------------------------------------------------------------- # ActiveMQ for the testsuite. diff --git a/deps/amqp10_common/Makefile b/deps/amqp10_common/Makefile index ba77dff626df..70a1be2070cd 100644 --- a/deps/amqp10_common/Makefile +++ b/deps/amqp10_common/Makefile @@ -48,7 +48,6 @@ PLT_APPS = eunit include ../../rabbitmq-components.mk include ../../erlang.mk -HEX_TARBALL_FILES += ../../rabbitmq-components.mk \ - git-revisions.txt +HEX_TARBALL_FILES += git-revisions.txt -include development.post.mk diff --git a/deps/amqp_client/Makefile b/deps/amqp_client/Makefile index 8d811e4dbccb..84dc8417b5de 100644 --- a/deps/amqp_client/Makefile +++ b/deps/amqp_client/Makefile @@ -54,5 +54,4 @@ PLT_APPS = ssl public_key include ../../rabbitmq-components.mk include ../../erlang.mk -HEX_TARBALL_FILES += ../../rabbitmq-components.mk \ - git-revisions.txt +HEX_TARBALL_FILES += git-revisions.txt diff --git a/deps/rabbit_common/Makefile b/deps/rabbit_common/Makefile index f74485549695..4dd5a79553aa 100644 --- a/deps/rabbit_common/Makefile +++ b/deps/rabbit_common/Makefile @@ -48,8 +48,7 @@ PLT_APPS += mnesia crypto ssl include ../../rabbitmq-components.mk include ../../erlang.mk -HEX_TARBALL_FILES += ../../rabbitmq-components.mk \ - git-revisions.txt \ +HEX_TARBALL_FILES += git-revisions.txt \ mk/rabbitmq-build.mk \ mk/rabbitmq-dist.mk \ mk/rabbitmq-early-plugin.mk \ From 31011a6949df6b223e2997724f396fda89751fab Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Mon, 10 Nov 2025 06:16:28 -0800 Subject: [PATCH 2/2] Do not include Makefiles into HEX_TARBALL_FILES Per discussion in #14915. --- deps/amqp10_client/Makefile | 2 -- deps/amqp10_common/Makefile | 2 -- deps/amqp_client/Makefile | 2 -- deps/rabbit_common/Makefile | 6 ------ 4 files changed, 12 deletions(-) diff --git a/deps/amqp10_client/Makefile b/deps/amqp10_client/Makefile index 31840086eea9..8f6c00d7c63a 100644 --- a/deps/amqp10_client/Makefile +++ b/deps/amqp10_client/Makefile @@ -44,8 +44,6 @@ dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master include ../../rabbitmq-components.mk include ../../erlang.mk -HEX_TARBALL_FILES += git-revisions.txt - # -------------------------------------------------------------------- # ActiveMQ for the testsuite. # -------------------------------------------------------------------- diff --git a/deps/amqp10_common/Makefile b/deps/amqp10_common/Makefile index 70a1be2070cd..2b168c37197b 100644 --- a/deps/amqp10_common/Makefile +++ b/deps/amqp10_common/Makefile @@ -48,6 +48,4 @@ PLT_APPS = eunit include ../../rabbitmq-components.mk include ../../erlang.mk -HEX_TARBALL_FILES += git-revisions.txt - -include development.post.mk diff --git a/deps/amqp_client/Makefile b/deps/amqp_client/Makefile index 84dc8417b5de..b78bd45e273a 100644 --- a/deps/amqp_client/Makefile +++ b/deps/amqp_client/Makefile @@ -53,5 +53,3 @@ PLT_APPS = ssl public_key include ../../rabbitmq-components.mk include ../../erlang.mk - -HEX_TARBALL_FILES += git-revisions.txt diff --git a/deps/rabbit_common/Makefile b/deps/rabbit_common/Makefile index 4dd5a79553aa..0b6aa186e5d8 100644 --- a/deps/rabbit_common/Makefile +++ b/deps/rabbit_common/Makefile @@ -48,10 +48,4 @@ PLT_APPS += mnesia crypto ssl include ../../rabbitmq-components.mk include ../../erlang.mk -HEX_TARBALL_FILES += git-revisions.txt \ - mk/rabbitmq-build.mk \ - mk/rabbitmq-dist.mk \ - mk/rabbitmq-early-plugin.mk \ - mk/rabbitmq-hexpm.mk - -include development.post.mk