diff options
author | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2020-11-17 15:29:05 +0100 |
---|---|---|
committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2020-11-17 15:29:05 +0100 |
commit | 778e8dad5ceb9fec974d7ceea04081cc2e35872b (patch) | |
tree | 1496b8e37b9cf896ad7f578d9259e466a7252bd1 | |
parent | 1005eef2ff59a5964cce4e3e49d170c8ed979e2f (diff) | |
download | rabbitmq-server-git-778e8dad5ceb9fec974d7ceea04081cc2e35872b.tar.gz |
rabbit_common: Remove the rabbitmq-github-actions Erlang.mk plugin
This is unused after the switch to the "monorepository".
-rw-r--r-- | deps/amqp10_client/Makefile | 3 | ||||
-rw-r--r-- | deps/rabbit/Makefile | 3 | ||||
-rw-r--r-- | deps/rabbit_common/Makefile | 3 | ||||
-rw-r--r-- | deps/rabbit_common/mk/rabbitmq-github-actions.mk | 174 | ||||
-rw-r--r-- | deps/rabbit_common/mk/rabbitmq-plugin.mk | 4 |
5 files changed, 3 insertions, 184 deletions
diff --git a/deps/amqp10_client/Makefile b/deps/amqp10_client/Makefile index d57ad3ede2..6f84e2cfee 100644 --- a/deps/amqp10_client/Makefile +++ b/deps/amqp10_client/Makefile @@ -13,8 +13,7 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-macros.mk \ rabbit_common/mk/rabbitmq-dist.mk \ rabbit_common/mk/rabbitmq-run.mk \ rabbit_common/mk/rabbitmq-test.mk \ - rabbit_common/mk/rabbitmq-tools.mk \ - rabbit_common/mk/rabbitmq-github-actions.mk + rabbit_common/mk/rabbitmq-tools.mk DEP_PLUGINS += elvis_mk dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile index 27d6a68a89..7d2fae2ea5 100644 --- a/deps/rabbit/Makefile +++ b/deps/rabbit/Makefile @@ -154,8 +154,7 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \ rabbit_common/mk/rabbitmq-dist.mk \ rabbit_common/mk/rabbitmq-run.mk \ rabbit_common/mk/rabbitmq-test.mk \ - rabbit_common/mk/rabbitmq-tools.mk \ - rabbit_common/mk/rabbitmq-github-actions.mk + rabbit_common/mk/rabbitmq-tools.mk # FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be # reviewed and merged. diff --git a/deps/rabbit_common/Makefile b/deps/rabbit_common/Makefile index 9d0cb3c18b..6a31a9ccbf 100644 --- a/deps/rabbit_common/Makefile +++ b/deps/rabbit_common/Makefile @@ -41,8 +41,7 @@ DEP_PLUGINS = $(PROJECT)/mk/rabbitmq-build.mk \ $(PROJECT)/mk/rabbitmq-hexpm.mk \ $(PROJECT)/mk/rabbitmq-dist.mk \ $(PROJECT)/mk/rabbitmq-test.mk \ - $(PROJECT)/mk/rabbitmq-tools.mk \ - $(PROJECT)/mk/rabbitmq-github-actions.mk + $(PROJECT)/mk/rabbitmq-tools.mk WITHOUT = plugins/proper diff --git a/deps/rabbit_common/mk/rabbitmq-github-actions.mk b/deps/rabbit_common/mk/rabbitmq-github-actions.mk deleted file mode 100644 index d708764bba..0000000000 --- a/deps/rabbit_common/mk/rabbitmq-github-actions.mk +++ /dev/null @@ -1,174 +0,0 @@ -.PHONY: github-actions - -ifneq ($(filter github-actions,$(MAKECMDGOALS)),) - -# All versions of Erlang we want to test against. -ERLANG_VERSIONS ?= 22.3 \ - 23.1 - -ELIXIR_VERSION ?= 1.10.4 - -WORKFLOWS_DIR ?= .github/workflows - -# One workflow file per Erlang version. The files are in $(WORKFLOWS_DIR). -TESTING_WORKFLOWS := \ - $(foreach erlang,$(ERLANG_VERSIONS),\ - $(WORKFLOWS_DIR)/test-erlang-otp-$(erlang).yaml) - -# The directories holding all the pieces used to create a test workflow. -# -# - All pieces of workflow are named *.yaml. -# - Files are sorted alphabetically before generating the workflow. -# - If several directories contain a piece with the same filename, only the -# first file found will be used. This allows a piece to be overriden. -ifeq ($(PROJECT),rabbit_common) -TESTING_JOBS_DIRS = $(WORKFLOWS_DIR)/test-jobs -else -TESTING_JOBS_DIRS = $(WORKFLOWS_DIR)/test-jobs \ - $(DEPS_DIR)/rabbit_common/$(WORKFLOWS_DIR)/test-jobs -endif - -# This variable takes care of sorting and deduplicating files. -TESTING_JOB_BASENAMES := \ - $(sort \ - $(notdir $(wildcard \ - $(patsubst %,%/*.yaml,$(TESTING_JOBS_DIRS))))) - -# This variable takes care of finding the final files which will make the -# workflow. I.e. overriden files are dropped at this point. -TESTING_JOBS := \ - $(foreach job_name,$(TESTING_JOB_BASENAMES),\ - $(firstword $(wildcard $(patsubst %,%/$(job_name),$(TESTING_JOBS_DIRS))))) - -# The file named *-CT_SUITE.yaml is special: it will be duplicated for each -# common_test testsuite available in the project. -CT_SUITE_JOB_BASENAME := $(filter %-CT_SUITE.yaml,$(TESTING_JOB_BASENAMES)) - -MIXED_VERSION_TESTING_WITH := $(shell \ - git tag -l --sort=v:refname v* | \ - awk '\ - BEGIN { \ - current_branch = "$(patsubst v%,%,$(base_rmq_ref))"; \ - n = split(current_branch, cmps, "."); \ - if (n == 3) { \ - current_major = cmps[1]; \ - current_minor = cmps[2]; \ - } \ - } \ - /^v[1-9][0-9]*\.[0-9]+\.[0-9]+$$/ { \ - version = $$0; \ - sub(/^v/, "", version); \ - n = split(version, cmps, "."); \ - if (n != 3) { \ - next; \ - } \ - major = cmps[1]; \ - minor = cmps[2]; \ - branch = "v" major "." minor ".x"; \ - if (current_major) { \ - if (major < current_major || \ - (major == current_major && minor == current_minor)) { \ - if (!tags[branch]) { \ - tags[branch] = $$0; \ - } \ - } else if (major < current_major || \ - (major == current_major && minor < current_minor)) { \ - tags[branch] = $$0; \ - } \ - } else { \ - tags[branch] = $$0; \ - } \ - } \ - END { \ - for (branch in tags) { \ - print tags[branch]; \ - } \ - } \ - ') - -WORKFLOWS := $(TESTING_WORKFLOWS) - -github-actions: $(WORKFLOWS) - $(verbose) if test "$(DO_COMMIT)" = 'yes'; then \ - git diff --quiet -- $(WORKFLOWS) \ - || git commit -m 'GitHub Actions: Regen workflows' -- $(WORKFLOWS); \ - fi - -# The actual recipe which creates the workflow. -# -# There is a condition on the input file name: if it is `*-CT_SUITE.yaml` the -# file will be appended once per common_test testsuite. The name of the -# testsuite is replaced. -# -# For all other files, they are appended once in total. There is a special -# handling of lines containing `$(CT_SUITES)`: the line is duplicated for each -# common_test testsuite. -define test_workflow - -.PHONY: $(WORKFLOWS_DIR)/test-erlang-otp-$(1).yaml - -ifeq ($(1),$$(firstword $$(ERLANG_VERSIONS))) -$(WORKFLOWS_DIR)/test-erlang-otp-$(1).yaml: ERLANG_VERSION_IS = oldest -else ifeq ($(1),$$(lastword $$(ERLANG_VERSIONS))) -$(WORKFLOWS_DIR)/test-erlang-otp-$(1).yaml: ERLANG_VERSION_IS = latest -endif - -$(WORKFLOWS_DIR)/test-erlang-otp-$(1).yaml: - $$(gen_verbose) mkdir -p "$$(dir $$@)" - $$(verbose) :> "$$@" - $$(verbose) \ - $$(foreach job,$$(TESTING_JOBS),\ - $$(if $$(filter %/$$(CT_SUITE_JOB_BASENAME),$$(job)),\ - $$(foreach ct_suite,$$(sort $$(CT_SUITES)),\ - sed -E \ - -e 's/\$$$$\(ERLANG_VERSION\)/$(1)/g' \ - -e 's/\$$$$\(ERLANG_VERSION_IS\)/$$(ERLANG_VERSION_IS)/g' \ - -e 's/\$$$$\(ELIXIR_VERSION\)/$(ELIXIR_VERSION)/g' \ - -e 's/\$$$$\(PROJECT\)/$(PROJECT)/g' \ - -e 's/\$$$$\(RABBITMQ_COMPONENT_REPO_NAME\)/$(RABBITMQ_COMPONENT_REPO_NAME)/g' \ - -e 's/\$$$$\(base_rmq_ref\)/$(base_rmq_ref)/g' \ - -e 's/\$$$$\(MIXED_VERSION_TESTING_WITH\)/$(sort $(MIXED_VERSION_TESTING_WITH))/g' \ - -e 's/\$$$$\(SECONDARY_UMBRELLAS_CACHE_KEY\)/secondary-umbrellas-$(subst $(space),-,$(sort $(MIXED_VERSION_TESTING_WITH)))-erlang-$(1)-rev4/g' \ - -e 's/\$$$$\(CT_SUITE\)/$$(ct_suite)/g' \ - < "$$(job)" >> "$$@";\ - )\ - ,\ - sed -E \ - -e 's/\$$$$\(ERLANG_VERSION\)/$(1)/g' \ - -e 's/\$$$$\(ERLANG_VERSION_IS\)/$$(ERLANG_VERSION_IS)/g' \ - -e 's/\$$$$\(ELIXIR_VERSION\)/$(ELIXIR_VERSION)/g' \ - -e 's/\$$$$\(PROJECT\)/$(PROJECT)/g' \ - -e 's/\$$$$\(RABBITMQ_COMPONENT_REPO_NAME\)/$(RABBITMQ_COMPONENT_REPO_NAME)/g' \ - -e 's/\$$$$\(base_rmq_ref\)/$(base_rmq_ref)/g' \ - -e 's/\$$$$\(MIXED_VERSION_TESTING_WITH\)/$(sort $(MIXED_VERSION_TESTING_WITH))/g' \ - -e 's/\$$$$\(SECONDARY_UMBRELLAS_CACHE_KEY\)/secondary-umbrellas-$(subst $(space),-,$(sort $(MIXED_VERSION_TESTING_WITH)))-erlang-$(1)-rev4/g' \ - < "$$(job)" | \ - awk \ - '\ - BEGIN { \ - ct_suites_count = split("$$(CT_SUITES)", ct_suites); \ - } \ - /\$$$$\(CT_SUITES\)/ { \ - for (i = 1; i <= ct_suites_count; i++) { \ - line = $$$$0; \ - gsub(/\$$$$\(CT_SUITES\)/, ct_suites[i], line); \ - print line; \ - } \ - next; \ - } \ - { print; } \ - '\ - >> "$$@";\ - )) - -endef - -$(eval \ -$(foreach erlang,$(ERLANG_VERSIONS),\ -$(call test_workflow,$(erlang))\ -)) - -clean-github-actions: - @rm -f $(WORKFLOWS) - -endif diff --git a/deps/rabbit_common/mk/rabbitmq-plugin.mk b/deps/rabbit_common/mk/rabbitmq-plugin.mk index fd3a33e271..29064a9a4f 100644 --- a/deps/rabbit_common/mk/rabbitmq-plugin.mk +++ b/deps/rabbit_common/mk/rabbitmq-plugin.mk @@ -21,7 +21,3 @@ endif ifeq ($(filter rabbitmq-tools.mk,$(notdir $(MAKEFILE_LIST))),) include $(dir $(lastword $(MAKEFILE_LIST)))rabbitmq-tools.mk endif - -ifeq ($(filter rabbitmq-github-actions.mk,$(notdir $(MAKEFILE_LIST))),) -include $(dir $(lastword $(MAKEFILE_LIST)))rabbitmq-github-actions.mk -endif |