CA-385151 & CP-45516: Fix skipped patch + Bump pipeline to v4.12 #3259
Conversation
This file contains 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
The patch was skipped, and the "Launch XenCenter" button did not show anymore. This was because the custom property `XS_WixUIRMPressedOk` is defined within the patch. Signed-off-by: Danilo Del Busso <[email protected]>
Signed-off-by: Danilo Del Busso <[email protected]>
danilo-delbusso
changed the title
MsiRMFilesInUse patch
|
One line containing one space has been removed from the bottom of the patch - might it fail to apply? |
kc284
approved these changes
Nov 16, 2023
CitrixChris
approved these changes
Nov 17, 2023
kc284
added
2 approvals
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The patch was skipped, and the "Launch XenCenter" button did not show anymore. This was because the custom property
XS_WixUIRMPressedOkis defined within the patch.Regressed after dd98fe6 because the way we're applying patches with the PowerShell script doesn't like the
diff --gitformat.I suspect it's got something to do with defining proper directories using
git apply --directorybut an easy solution (this one) is to just usegit -ru