Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Mar 8, 2025

Proposed Changes

This change adds a source-bundle build target to the RabbitMQ Makefile. This target is identical to the existing source-dist target but it also allows for packaging and testing of the source archive.

Code duplication is avoided by moving the common code for both targets to a generic function, which is responsible for creating the actual Makefile targets. The differing properties (like rsync flags) are passed in as function arguments.

This is a re-implementation of the change in #13385. Additional testing has been done to verify that existing targets do not change/break.

Types of Changes

What types of changes does your code introduce to this project?
Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes issue #NNNN)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause an observable behavior change in existing systems)
  • Documentation improvements (corrections, new content, etc)
  • Cosmetic change (whitespace, formatting, etc)
  • Build system and/or CI

Checklist

Put an x in the boxes that apply.
You can also fill these out after creating the PR.
If you're unsure about any of them, don't hesitate to ask on the mailing list.
We're here to help!
This is simply a reminder of what we are going to look for before merging your code.

  • I have read the CONTRIBUTING.md document
  • I have signed the CA (see https://cla.pivotal.io/sign/rabbitmq)
  • I have added tests that prove my fix is effective or that my feature works
  • All tests pass locally with my changes
  • If relevant, I have added necessary documentation to https://github.com/rabbitmq/rabbitmq-website
  • If relevant, I have added this change to the first version(s) in release-notes that I expect to introduce it

Further Comments

This PR consists of two commits - the earlier commit adds the source-bundle in a straightforward manner by duplicating the logic for source-dist and simply modifying the rsync flags. The second commit refactors common code to a generic function, as described above.


This is an automatic backport of pull request #13471 done by Mergify.

kartg added 2 commits March 8, 2025 03:06
…ist" target

The main difference is that the "bundle" target does NOT exclude packaging and testing directories, which enables packaging and testing of the source archive.

Signed-off-by: Kartik Ganesh <[email protected]>
(cherry picked from commit 54cbb74)
This is done by introducing a generic function that holds the common code, which then creates these two targets. The differing properties (like rsync flags) are passed in as function arguments.

Signed-off-by: Kartik Ganesh <[email protected]>
(cherry picked from commit f84c210)
@mergify mergify bot added the make label Mar 8, 2025
@michaelklishin michaelklishin merged commit 6faaf13 into v4.1.x Mar 8, 2025
266 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.1.x/pr-13471 branch March 8, 2025 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants