root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update branch names and links 

Fix publish of libs to hex.pm

@lhoguin noticed that the hex packages for the amqp_client, amqp10_client and related project do not currently work with erlang.mk. This PR fixes this issue.

Tested using this project: https://github.com/lukebakken/amqp-clients-test.git
This commit is contained in:
Luke Bakken 2022-09-29 08:22:43 -07:00
parent 2c84394f30
commit 553aab51c9
No known key found for this signature in database
GPG Key ID: D99DE30E43EAE440
17 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deps/amqp10_client/Makefile vendored
View File

@ -45,10 +45,11 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-macros.mk \
DEP_PLUGINS += elvis_mk DEP_PLUGINS += elvis_mk
dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master
include ../../rabbitmq-components.mk include rabbitmq-components.mk
include ../../erlang.mk include erlang.mk
HEX_TARBALL_FILES += $(DEPS_DIR)/../rabbitmq-components.mk HEX_TARBALL_FILES += rabbitmq-components.mk \
git-revisions.txt
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# Compiler flags. # Compiler flags.

1
deps/amqp10_client/erlang.mk vendored Symbolic link
View File

@ -0,0 +1 @@
../../erlang.mk

1
deps/amqp10_client/rabbitmq-components.mk vendored Symbolic link
View File

@ -0,0 +1 @@
../../rabbitmq-components.mk

7
deps/amqp10_common/Makefile vendored
View File

@ -44,9 +44,10 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
rabbit_common/mk/rabbitmq-test.mk \ rabbit_common/mk/rabbitmq-test.mk \
rabbit_common/mk/rabbitmq-tools.mk rabbit_common/mk/rabbitmq-tools.mk
include ../../rabbitmq-components.mk include rabbitmq-components.mk
include ../../erlang.mk include erlang.mk
HEX_TARBALL_FILES += $(DEPS_DIR)/../rabbitmq-components.mk HEX_TARBALL_FILES += rabbitmq-components.mk \
git-revisions.txt
-include development.post.mk -include development.post.mk

1
deps/amqp10_common/erlang.mk vendored Symbolic link
View File

@ -0,0 +1 @@
../../erlang.mk

1
deps/amqp10_common/rabbitmq-components.mk vendored Symbolic link
View File

@ -0,0 +1 @@
../../rabbitmq-components.mk

7
deps/amqp_client/Makefile vendored
View File

@ -53,7 +53,8 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
PLT_APPS = ssl public_key PLT_APPS = ssl public_key
include ../../rabbitmq-components.mk include rabbitmq-components.mk
include ../../erlang.mk include erlang.mk
HEX_TARBALL_FILES += $(DEPS_DIR)/../rabbitmq-components.mk HEX_TARBALL_FILES += rabbitmq-components.mk \
git-revisions.txt

1
deps/amqp_client/erlang.mk vendored Symbolic link
View File

@ -0,0 +1 @@
../../erlang.mk

1
deps/amqp_client/rabbitmq-components.mk vendored Symbolic link
View File

@ -0,0 +1 @@
../../rabbitmq-components.mk

18
deps/rabbit_common/Makefile vendored
View File

@ -6,7 +6,7 @@ define PROJECT_APP_EXTRA_KEYS
{licenses, ["MPL-2.0"]}, {licenses, ["MPL-2.0"]},
{links, [ {links, [
{"Website", "https://www.rabbitmq.com/"}, {"Website", "https://www.rabbitmq.com/"},
{"GitHub", "https://github.com/rabbitmq/rabbitmq-server/tree/master/deps/rabbit_common"} {"GitHub", "https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbit_common"}
]}, ]},
{build_tools, ["make", "rebar3"]}, {build_tools, ["make", "rebar3"]},
{files, [ {files, [
@ -20,7 +20,7 @@ define HEX_TARBALL_EXTRA_METADATA
licenses => [<<"MPL-2.0">>], licenses => [<<"MPL-2.0">>],
links => #{ links => #{
<<"Website">> => <<"https://www.rabbitmq.com">>, <<"Website">> => <<"https://www.rabbitmq.com">>,
<<"GitHub">> => <<"https://github.com/rabbitmq/rabbitmq-server/tree/master/deps/rabbit_common">> <<"GitHub">> => <<"https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbit_common">>
} }
} }
endef endef
@ -49,9 +49,17 @@ DEP_PLUGINS = $(PROJECT)/mk/rabbitmq-build.mk \
PLT_APPS += mnesia crypto ssl PLT_APPS += mnesia crypto ssl
include ../../rabbitmq-components.mk include rabbitmq-components.mk
include ../../erlang.mk include erlang.mk
HEX_TARBALL_FILES += $(DEPS_DIR)/../rabbitmq-components.mk HEX_TARBALL_FILES += rabbitmq-components.mk \
git-revisions.txt \
mk/rabbitmq-build.mk \
mk/rabbitmq-dist.mk \
mk/rabbitmq-early-test.mk \
mk/rabbitmq-hexpm.mk \
mk/rabbitmq-macros.mk \
mk/rabbitmq-test.mk \
mk/rabbitmq-tools.mk
-include development.post.mk -include development.post.mk

1
deps/rabbit_common/erlang.mk vendored Symbolic link
View File

@ -0,0 +1 @@
../../erlang.mk

1
deps/rabbit_common/rabbitmq-components.mk vendored Symbolic link
View File

@ -0,0 +1 @@
../../rabbitmq-components.mk

2
deps/rabbitmq_auth_backend_cache/README.md vendored
View File

@ -95,7 +95,7 @@ In the classic config format:
]. ].
``` ```
The following example combines this backend with the [HTTP backend](https://github.com/rabbitmq/rabbitmq-auth-backend-http/tree/master) and its [example Spring Boot application](https://github.com/rabbitmq/rabbitmq-auth-backend-http/tree/master/examples): The following example combines this backend with the [HTTP backend](https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbitmq_auth_backend_http) and its [example Spring Boot application](https://github.com/rabbitmq/rabbitmq-server/tree/main/deps/rabbitmq_auth_backend_http/examples):
auth_backends.1 = cache auth_backends.1 = cache

2
deps/rabbitmq_peer_discovery_k8s/README.md vendored
View File

@ -15,7 +15,7 @@ are not in scope for this plugin.
For a more comprehensive open source RabbitMQ on Kubernetes deployment solution, For a more comprehensive open source RabbitMQ on Kubernetes deployment solution,
see the [RabbitMQ Cluster Operator for Kubernetes](https://www.rabbitmq.com/kubernetes/operator/operator-overview.html). see the [RabbitMQ Cluster Operator for Kubernetes](https://www.rabbitmq.com/kubernetes/operator/operator-overview.html).
The Operator is developed [on GitHub](https://github.com/rabbitmq/cluster-operator/) and contains its The Operator is developed [on GitHub](https://github.com/rabbitmq/cluster-operator/) and contains its
own [set of examples](https://github.com/rabbitmq/cluster-operator/tree/master/docs/examples). own [set of examples](https://github.com/rabbitmq/cluster-operator/tree/main/docs/examples).
## Supported RabbitMQ Versions ## Supported RabbitMQ Versions

4
deps/rabbitmq_peer_discovery_k8s/examples/gke/README.md vendored
View File

@ -1,3 +1 @@
# Deploy RabbitMQ on Kubernetes with the Kubernetes Peer Discovery Plugin to GKE Please use the RabbitMQ Cluster Operator: [link](https://www.rabbitmq.com/kubernetes/operator/operator-overview.html)
This example has graduated and moved to [a separate repository](https://github.com/rabbitmq/diy-kubernetes-examples/tree/master/gke).

8
deps/rabbitmq_peer_discovery_k8s/examples/kind/README.md vendored
View File

@ -1,3 +1,7 @@
# Deploy RabbitMQ on Kubernetes with the Kubernetes Peer Discovery Plugin to Kind # Recommended Deployment
This example has graduated and moved to [a separate repository](https://github.com/rabbitmq/diy-kubernetes-examples/tree/master/kind). In Production, use the RabbitMQ Cluster Operator: [link](https://www.rabbitmq.com/kubernetes/operator/operator-overview.html)
## Deploy RabbitMQ on Kubernetes with the Kubernetes Peer Discovery Plugin to Kind
This example has graduated and moved to [a separate repository](https://github.com/rabbitmq/diy-kubernetes-examples/tree/master/kind#production-non-suitability)

8
deps/rabbitmq_peer_discovery_k8s/examples/minikube/README.md vendored
View File

@ -1,3 +1,7 @@
# Deploy RabbitMQ on Kubernetes with the Kubernetes Peer Discovery Plugin to Minikube # Recommended Deployment
This example has graduated and moved to [a separate repository](https://github.com/rabbitmq/diy-kubernetes-examples/tree/master/minikube). In Production, use the RabbitMQ Cluster Operator: [link](https://www.rabbitmq.com/kubernetes/operator/operator-overview.html)
## Deploy RabbitMQ on Kubernetes with the Kubernetes Peer Discovery Plugin to Minikube
This example has graduated and moved to [a separate repository](https://github.com/rabbitmq/diy-kubernetes-examples/tree/master/minikube).