Skip to content
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

[auto-merge] bot-auto-merge-branch-24.10 to branch-24.12 [skip ci] [bot] #2490

Merged
merged 2 commits into from
Oct 11, 2024

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Oct 11, 2024

auto-merge triggered by github actions on bot-auto-merge-branch-24.10 to create a PR keeping branch-24.12 up-to-date. If this PR is unable to be merged due to conflicts, it will remain open until manually fix.

revans2 and others added 2 commits October 11, 2024 11:00
* Revert "Update JNI build to support nvcomp4 (#2217)"

This reverts commit 0bbefc0.

* Version

* Apply and remove patches to CUDF as part of the build

Signed-off-by: Robert (Bobby) Evans <[email protected]>

* Better checking if git is dirty

* Some review comments

* Get submodule sync to work

Signed-off-by: Robert (Bobby) Evans <[email protected]>

---------

Signed-off-by: Robert (Bobby) Evans <[email protected]>
Co-authored-by: Gera Shegalov <[email protected]>
Signed-off-by: spark-rapids automation <[email protected]>
@nvauto nvauto merged commit c1760f0 into branch-24.12 Oct 11, 2024
@nvauto
Copy link
Collaborator Author

nvauto commented Oct 11, 2024

SUCCESS - auto-merge

@nvauto nvauto deleted the bot-auto-merge-branch-24.10 branch October 11, 2024 03:01
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.

2 participants