Fix auto merge conflict 11873 [skip ci] #11877
Merged
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
\nWait for the pre-merge CI job to SUCCEED Signed-off-by: nvauto <[email protected]>
* 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]>
YanxuanLiu
changed the title
NvTimLiu
approved these changes
Dec 16, 2024
|
build |
pxLi
approved these changes
Dec 16, 2024
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.
resolve the automerge conflict at #11873