-
Notifications
You must be signed in to change notification settings - Fork 126
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Apply custom patch only once by comparing the patch-id of the last commit #1833
Conversation
Verifying if removing |
707998d
to
f84330e
Compare
0662eeb
to
4a96b99
Compare
@heemin32 In some cases, we need to pull the submodule from top level (see build script). So I dont think this approach would work with that |
I can edit the build script as same as window.
|
f257a8d
to
5f3562a
Compare
@jmazanec15 raised a concern on having a list of patch file in multiple places and suggested to use git patch-id. Thanks. |
2227510
to
335b36e
Compare
bwc test is failing for all PR now with |
Signed-off-by: Heemin Kim <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks thats awesome!
Signed-off-by: Heemin Kim <[email protected]> (cherry picked from commit 1b425df)
…1843) Signed-off-by: Heemin Kim <[email protected]> (cherry picked from commit 1b425df) Co-authored-by: Heemin Kim <[email protected]>
…ch-project#1833) (opensearch-project#1843) Signed-off-by: Heemin Kim <[email protected]> (cherry picked from commit 1b425df) Co-authored-by: Heemin Kim <[email protected]>
Description
As more custom patches are added, it fails to re-apply same patches if more than one patch touch the same file. This lead to consistent build failure whenever we build jni library more than once. The workaround with the failure is removing both git rebase-apply folder and external/faiss folder and build from scratch which is inconvenient and increase development time.
To resolve the issue, changed the cmake file to apply custom patch only once by comparing the patch-id of the last commit.
Also, removed
submodule: true
option in CI as it seems it is not needed anymore after we upgraded linux image for CI build.Issues Resolved
N/A
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.