Avoid auto-merging thirdparty/cudf-pins #1928
Conversation
Signed-off-by: Jason Lowe <[email protected]>
|
@NvTimLiu do you have a way to test this change? I'm unclear on how the workflows get tested. |
This change have not yet be merged, and can not be triggered in the NVIDIA repo, so this auto-merge workflow change have to be verified in the forked repo instead Verified on my own forked repo: Auto merge code change : NvTimLiu#73 Not merge submodule change: NvTimLiu#75 (nothing changed on branch-24.06) |
|
@jlowe Oh I intended to suggest change on your PR, but did not know how to add suggestions, so changed auto-merge.yml file on your branched, please feel free to discard/revert it if you've better fix. Thanks! |
- Removes tests for the default `cudf::hash` - Updates cudf deps pins to workaround the issue being fixed by #1928 Testing: ```bash $ cd thirdparty/cudf $ git checkout branch-24.06 $ cd - $ ./build/build-in-docker clean install -DGPU_ARCHS='NATIVE' -DBUILD_TESTS=0N -DskipTests -Dlibcudf.clean.skip=false -Dlibcudf.dependency.mode=latest -Dsubmodule.check.skip $ ./target/cmake-build/gtests/HASH ``` Fixes #1926 Signed-off-by: Gera Shegalov <[email protected]>
|
build |
@NvTimLiu Please help to trigger pre-merge pipeline. I still got not-authorized error. Thanks! |
|
build |
We want to merge all spark-rapids-jni HEAD(24.04) commit to BASE(24.06), But we do not want to merge submodules(24.04 cudf cudf-pin) to BASE(24.06) As we need pin cudf/cudf-pin submodules to 24.06 instead of 24.04
|
build |
| OUT=$(git --no-pager diff --name-only origin/${BASE} | grep "${FILE_USE_BASE}" || true) | ||
| [[ ! -z "${OUT}" ]] && git checkout origin/${BASE} -- ${FILE_USE_BASE} && \ | ||
| git commit -s -am "Auto-merge use submodule in BASE ref" | ||
| # Use commits from HEAD, but keek submodule files(FILE_USE_BASE) from BASE |
There was a problem hiding this comment.
nit: HEAD is confusing given that it also used for the tip of the branch
| # Use commits from HEAD, but keek submodule files(FILE_USE_BASE) from BASE | |
| # Sync the $BASE branch using commits from the $HEAD branch except for the paths | |
| # defined as $FILE_USE_BASE (under ./thirdparty) |
There was a problem hiding this comment.
Let me follow it up and the typo in the comments here : #1954
Fixes #1927. This avoids automatically merging thirdparty/cudf-pins files when automatically merging changes between branches.