(Updated) Adding a "source-bundle" target to the Makefile #13471
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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]>
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]>
Contributor
Author
Test process detailsSetupFirst, I ran the Next, I switched to the feature branch and executed the source-dist verificationThe following commands produce no diff/output, verifying that the artifacts produced by the source-bundle compared to source-distThe following commands verify that the only difference between the output of |
Contributor
Author
|
I ran the commands that caused the prior PR to fail - #13385 (comment) - and verified that these pass now on the feature branch: I also ran these commands with |
Collaborator
|
@kartg thank you for sharing the steps you have taken to test these changes. |
michaelklishin
approved these changes
Mar 8, 2025
Collaborator
michaelklishin
left a comment
michaelklishin
left a comment
There was a problem hiding this comment.
A generic binary build produced from a source bundle passes a set of client test suites I use (plus rabbitmqadmin v2 tests) and seems as complete and functional as a source-dist-based binary build.
Now lets see how the alpha package workflow runs.
12 tasks
Collaborator
|
All packages were built successfully so we can backport. |
Collaborator
|
@Mergifyio backport v4.1.x v4.0.x |
✅ Backports have been created
|
This was referenced Mar 8, 2025
michaelklishin
added a commit
that referenced
this pull request
Mar 8, 2025
(Updated) Adding a "source-bundle" target to the Makefile (backport #13471)
michaelklishin
added a commit
that referenced
this pull request
Mar 8, 2025
(Updated) Adding a "source-bundle" target to the Makefile (backport #13471)
Contributor
Author
|
@michaelklishin thanks for merging this in! Also glad to see that I didn't break any of the packaging workflows this time 😅 Could this change be backported to |
michaelklishin
added a commit
that referenced
this pull request
Mar 8, 2025
(Updated) Adding a "source-bundle" target to the Makefile (cherry picked from commit 916b032) Conflicts: Makefile
Collaborator
|
@kartg since this is a non-functional change, I've backported manually to |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
This change adds a
source-bundlebuild target to the RabbitMQ Makefile. This target is identical to the existingsource-disttarget 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
rsyncflags) 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
xin the boxes that applyChecklist
Put an
xin 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.
CONTRIBUTING.mddocumentFurther Comments
This PR consists of two commits - the earlier commit adds the
source-bundlein a straightforward manner by duplicating the logic forsource-distand simply modifying thersyncflags. The second commit refactors common code to a generic function, as described above.