[release/8.0] Fix copying of cbl-mariner packages #16164
Merged
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
hoyosjs
reviewed
Sep 25, 2025
| <Target Name="_BuildMarinerRpm" | ||
| AfterTargets="GenerateRpm" | ||
| Condition="'$(PackageTargetOS)' != ''"> | ||
| Condition="'$(PackageTargetOS)' == ''"> |
There was a problem hiding this comment.
Is there any ordering that needs to happen between this and the next target for the new key? Both will run for one package.
There was a problem hiding this comment.
There shouldn't be any ordering requirements here.
rbhanda
approved these changes
Sep 25, 2025
jkoritzinsky
approved these changes
Sep 25, 2025
mmitche
approved these changes
Sep 25, 2025
NikolaMilosavljevic
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Code that creates copies RPM packages for
cm.1andcm.2was moved to a new target that is conditioned onPackageTargetOSproperty. This property is only set for DEPS packages, which we do not need to copy.The fix is to revert the condition to build the target when property is empty/missing.