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

Revert "rabbitmq-components.mk: Skip CI when updating rabbitmq-components.mk" 

Unfortunately, the "skip CI" feature isn't what I would expect: I
expected that such a commit would not trigger a job, but that the commit
would still be picked by a job triggered for another reason. In fact,
it's entirely ignored: the resource will be stuck at the previous
commit, until another regular commit (i.e. without the "skip CI"
message) is pushed.

This reverts commit c9e636c0b4.
This commit is contained in:
Jean-Sébastien Pédron 2017-11-28 13:03:12 +01:00
parent c9e636c0b4
commit 23bc5cc1b5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbit_common/mk/rabbitmq-components.mk vendored
View File

@ -339,6 +339,6 @@ rabbitmq-components-mk:
$(gen_verbose) cp -a $(UPSTREAM_RMQ_COMPONENTS_MK) . $(gen_verbose) cp -a $(UPSTREAM_RMQ_COMPONENTS_MK) .
ifeq ($(DO_COMMIT),yes) ifeq ($(DO_COMMIT),yes)
$(verbose) git diff --quiet rabbitmq-components.mk \ $(verbose) git diff --quiet rabbitmq-components.mk \
|| git commit -m "$$(printf "Update rabbitmq-components.mk\n\n[ci skip]")" rabbitmq-components.mk || git commit -m 'Update rabbitmq-components.mk' rabbitmq-components.mk
endif endif
endif endif