Skip to content

Commit

Permalink
Revert "[submodule-sync] bot-submodule-sync-branch-24.02 to branch-24…
Browse files Browse the repository at this point in the history
….02 [ski…" (#1828)

This reverts commit 18745a6.
  • Loading branch information
NvTimLiu authored Mar 5, 2024
1 parent 18745a6 commit f1e37af
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
18 changes: 4 additions & 14 deletions ci/submodule-sync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

set -ex

OWNER=${OWNER:-"NVTIMLIU"}
OWNER=${OWNER:-"NVIDIA"}
REPO=${REPO:-"spark-rapids-jni"}
PARALLEL_LEVEL=${PARALLEL_LEVEL:-4}
REPO_LOC="github.com/${OWNER}/${REPO}.git"
Expand Down Expand Up @@ -50,13 +50,7 @@ else
fi

# sync up cudf from remote
if [ -n "$CUDF_TAG" ]; then
pushd thirdparty/cudf
git checkout tags/$CUDF_TAG
popd
else
git submodule update --remote --merge
fi
git submodule update --remote --merge
cudf_sha=$(git -C thirdparty/cudf rev-parse HEAD)
if [[ "${cudf_sha}" == "${cudf_prev_sha}" ]]; then
echo "Submodule is up to date."
Expand All @@ -65,18 +59,14 @@ fi

echo "Try update cudf submodule to ${cudf_sha}..."
git add .
if [ -n "$CUDF_TAG" ]; then
git diff-index --quiet HEAD || git commit -s -m "Update submodule cudf to ${CUDF_TAG}"
else
git diff-index --quiet HEAD || git commit -s -m "Update submodule cudf to ${cudf_sha}"
fi
git diff-index --quiet HEAD || git commit -s -m "Update submodule cudf to ${cudf_sha}"
sha=$(git rev-parse HEAD)

echo "Test against ${cudf_sha}..."

MVN="mvn -Dmaven.wagon.http.retryHandler.count=3 -B"
set +e
echo ${MVN} verify ${MVN_MIRROR} \
${MVN} verify ${MVN_MIRROR} \
-DCPP_PARALLEL_LEVEL=${PARALLEL_LEVEL} \
-Dlibcudf.build.configure=true \
-DUSE_GDS=ON -Dtest=*,!CuFileTest,!CudaFatalTest,!ColumnViewNonEmptyNullsTest \
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/cudf
Submodule cudf updated 227 files

0 comments on commit f1e37af

Please sign in to comment.