Merge branch 'master' into oauth2-credential-expiration-support

deps/rabbit_common/mk/rabbitmq-components.mk

@@ -184,6 +184,15 @@ RABBITMQ_COMPONENTS = amqp_client \
 		      rabbitmq_web_stomp_examples \
 		      rabbitmq_website
 
+# Erlang.mk does not rebuild dependencies by default, once they were
+# compiled once, except for those listed in the `$(FORCE_REBUILD)`
+# variable.
+#
+# We want all RabbitMQ components to always be rebuilt: this eases
+# the work on several components at the same time.
+
+FORCE_REBUILD = $(RABBITMQ_COMPONENTS)
+
 # Several components have a custom erlang.mk/build.config, mainly
 # to disable eunit. Therefore, we can't use the top-level project's
 # erlang.mk copy.

deps/rabbit_common/mk/rabbitmq-dist.mk

@@ -50,7 +50,7 @@ $$(dist_$(1)_ez): SRC_DIR = $(3)
 $$(dist_$(1)_ez): EZ_DIR  = $$(abspath $$(dist_$(1)_ez_dir))
 $$(dist_$(1)_ez): EZ      = $$(dist_$(1)_ez)
 $$(dist_$(1)_ez): $$(if $$(wildcard $(3)/ebin $(3)/include $(3)/priv),\
-	$$(call core_find,$$(wildcard $(3)/ebin $(3)/include $(3)/priv),*),)
+	$$(filter-out %/dep_built,$$(call core_find,$$(wildcard $(3)/ebin $(3)/include $(3)/priv),*)),)
 
 # If the application's Makefile defines a `list-dist-deps` target, we
 # use it to populate the dependencies list. This is useful when the
@@ -92,7 +92,7 @@ $$(dist_$(1)_ez): SRC_DIR = $(3)
 $$(dist_$(1)_ez): EZ_DIR  = $$(abspath $$(dist_$(1)_ez_dir))
 $$(dist_$(1)_ez): EZ      = $$(dist_$(1)_ez)
 $$(dist_$(1)_ez): $$(if $$(wildcard _build/dev/lib/$(1)/ebin $(3)/priv),\
-	$$(call core_find,$$(wildcard _build/dev/lib/$(1)/ebin $(3)/priv),*),)
+	$$(filter-out %/dep_built,$$(call core_find,$$(wildcard _build/dev/lib/$(1)/ebin $(3)/priv),*)),)
 
 MIX_DIST_EZS += $$(dist_$(1)_ez)
 EXTRA_DIST_EZS += $$(call get_mix_project_dep_ezs,$(3))

deps/rabbit_common/mk/rabbitmq-early-test.mk

@@ -22,6 +22,7 @@ DIALYZER_OPTS ?= -Werror_handling -Wrace_conditions
 
 ifneq ($(words $(filter %-on-concourse,$(MAKECMDGOALS))),0)
 TEST_DEPS += ci $(RMQ_CI_CT_HOOKS)
+NO_AUTOPATCH += ci $(RMQ_CI_CT_HOOKS)
 dep_ci = git git@github.com:rabbitmq/rabbitmq-ci master
 endif
 

deps/rabbit_common/mk/rabbitmq-mix.mk

@@ -1,10 +0,0 @@
-# This file is copied to rabbitmq_cli (and possibly other Elixir-based
-# components) when the RabbitMQ source archive is created, to allow
-# those Elixir applications to build even with no access to Hex.pm,
-# using the bundled sources only.
-
-HEX_OFFLINE=1
-
-HOME=$(DEPS_DIR)
-
-export HEX_OFFLINE HOME

deps/rabbit_common/mk/rabbitmq-test.mk

@@ -22,7 +22,7 @@ xref: $(ERLANG_MK_RECURSIVE_DEPS_LIST)
 # --------------------------------------------------------------------
 
 FLY ?= fly
-FLY_TARGET ?= $(shell $(FLY) targets | awk '/ci-aws\.rabbitmq\.com/ { print $$1; }')
+FLY_TARGET ?= $(shell $(FLY) targets | awk '/ci\.rabbitmq\.com/ { print $$1; }')
 
 CONCOURSE_TASK = $(ERLANG_MK_TMP)/concourse-task.yaml
 
@@ -71,7 +71,7 @@ endif
 	$(verbose) test -d "$(PIPELINE_DIR)"
 	$(verbose) echo '  MAKE_TARGET: "$*"' >> "$(CONCOURSE_TASK)"
 	$(FLY) -t $(FLY_TARGET) execute \
-		--config "$(CONCOURSE_TASK)" \
+		--config="$(CONCOURSE_TASK)" \
 		$(foreach input,$(TASK_INPUTS), \
 		$(if $(filter $(PROJECT),$(input)), \
 		--input="$(input)=.", \