Skip to content

Exit CMake processing when apply_patches failed #304

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

Merged
merged 3 commits into from
Jan 25, 2022

Conversation

haonanya
Copy link

@haonanya haonanya commented Jan 4, 2022

When git am operation, which is used to apply patches, fails for some reason during opencl-clang build, the build is continued.
This results in a opencl-clang package without all expected patches applied, it can cause its users to fail.

Signed-off-by: haonanya [email protected]

@haonanya haonanya requested review from wenju-he, cdai2 and fzou1 January 5, 2022 01:28
Copy link
Contributor

@wenju-he wenju-he left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks, please also do this for other branches

@haonanya haonanya force-pushed the improve_apply_patch branch from 5439d32 to fcc8da1 Compare January 5, 2022 01:52
Signed-off-by: haonanya <[email protected]>
haonanya pushed a commit to haonanya/opencl-clang that referenced this pull request Jan 5, 2022
This backports patches from other branches

1. Check if apply_patches is successful, intel#175
2. Apply llvm/clang patches together, intel#179
3. Exit CMake processing when apply_patches failed, intel#304

Signed-off-by: haonanya <[email protected]>
@haonanya
Copy link
Author

Hi, if there is no more further comments, I will merge it today. Thanks very much.

@haonanya haonanya merged commit 68f866a into intel:ocl-open-100 Jan 25, 2022
haonanya pushed a commit that referenced this pull request Jan 25, 2022
* Improve patching mechanism

This backports patches from other branches

1. Check if apply_patches is successful, #175
2. Apply llvm/clang patches together, #179
3. Exit CMake processing when apply_patches failed, #304

Signed-off-by: haonanya <[email protected]>

* Skip the rest when apply patch failed

Signed-off-by: haonanya <[email protected]>
@haonanya haonanya deleted the improve_apply_patch branch June 16, 2022 05:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants