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] branch-24.12 to branch-25.02 [skip ci] [bot] #11873

Merged
merged 4 commits into from
Dec 16, 2024

Conversation

nvauto
Copy link
Collaborator

@nvauto nvauto commented Dec 16, 2024

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

\nWait for the pre-merge CI job to SUCCEED

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

nvauto commented Dec 16, 2024

FAILURE - Unable to auto-merge. Manual operation is required.

{'message': 'Pull Request is not mergeable', 'documentation_url': 'https://docs.github.com/rest/pulls/pulls#merge-a-pull-request', 'status': '405'}

Please use the following steps to fix the merge conflicts manually:

# Assume upstream is NVIDIA/spark-rapids remote
git fetch upstream branch-24.12 branch-25.02
git checkout -b fix-auto-merge-conflict-11873 upstream/branch-25.02
git merge upstream/branch-24.12
# Fix any merge conflicts caused by this merge
git commit -am "Merge branch-24.12 into branch-25.02"
git push <personal fork> fix-auto-merge-conflict-11873
# Open a PR targets NVIDIA/spark-rapids branch-25.02

IMPORTANT: Before merging this PR, be sure to change the merging strategy to Create a merge commit (repo admin only).

Once this PR is merged, the auto-merge PR should automatically be closed since it contains the same commit hashes

@pxLi
Copy link
Collaborator

pxLi commented Dec 16, 2024

this will be handled by @YanxuanLiu @NvTimLiu later

nvauto and others added 3 commits December 16, 2024 09:54
* Update latest changelog [skip ci]

Update change log with CLI: \n\n   scripts/generate-changelog --token=<GIT_TOKEN> --releases=24.10,24.12

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

* Update changelog

Signed-off-by: Tim Liu <[email protected]>

* update changelog to involve new changes.

Signed-off-by: Yanxuan Liu <[email protected]>

---------

Signed-off-by: nvauto <[email protected]>
Signed-off-by: Tim Liu <[email protected]>
Signed-off-by: Yanxuan Liu <[email protected]>
Co-authored-by: Tim Liu <[email protected]>
Co-authored-by: Yanxuan Liu <[email protected]>
Skip the build of the 350db143 shim, as v24.12.0 will not contain the 350db143 shim

Moreover, the v24.12.0 private dependency jar is not released.

To fix below error:

    [ERROR] Failed to execute goal on project rapids-4-spark-sql_2.12: Could not resolve dependencies for
     project com.nvidia:rapids-4-spark-sql_2.12:jar:24.12.0: Failure to find com.nvidia:rapids-4-spark-private_2.12:jar:spark350db143:24.12.0
     in https://repo1.maven.org/maven2 was cached in the local repository, resolution will not be reattempted until the update interval of central has elapsed or updates are forced

Signed-off-by: Tim Liu <[email protected]>
Update change log with CLI: \n\n   scripts/generate-changelog --token=<GIT_TOKEN> --releases=24.10,24.12

Signed-off-by: nvauto <[email protected]>
@pxLi pxLi merged commit 522c37e into branch-25.02 Dec 16, 2024
1 check passed
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.

3 participants