From 299a0f3e9943b0d93c7a1704ed6d94e0aa097e1f Mon Sep 17 00:00:00 2001 From: Peixin Date: Tue, 10 Oct 2023 17:00:13 +0800 Subject: [PATCH 1/2] fix docker modified check in premerge (#1485) Signed-off-by: Peixin Li --- ci/Jenkinsfile.premerge | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/Jenkinsfile.premerge b/ci/Jenkinsfile.premerge index 8ae54f1781b..72ef595a371 100644 --- a/ci/Jenkinsfile.premerge +++ b/ci/Jenkinsfile.premerge @@ -141,9 +141,10 @@ pipeline { container('cpu') { // check if pre-merge dockerfile modified def dockerfileModified = sh(returnStdout: true, - script: 'BASE=$(git --no-pager log --oneline -1 | awk \'{ print $NF }\'); ' + - 'git --no-pager diff --name-only HEAD $(git merge-base HEAD $BASE) ' + - "-- ${PREMERGE_DOCKERFILE} || true") +script: """BASE=\$(git --no-pager log --oneline -1 | awk \'{ print \$NF }\') +git --no-pager diff --name-only HEAD \$BASE -- ${PREMERGE_DOCKERFILE} || true""").trim() + echo "$dockerfileModified" + if (!dockerfileModified?.trim()) { TEMP_IMAGE_BUILD = false } From 6106e62da4a49d7013be4c2d315b1aee4a1d0b8f Mon Sep 17 00:00:00 2001 From: spark-rapids automation <70000568+nvauto@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:00:30 +0000 Subject: [PATCH 2/2] Auto-merge use submodule in BASE ref Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com> --- thirdparty/cudf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/cudf b/thirdparty/cudf index 3964950ba2f..e345620ddaf 160000 --- a/thirdparty/cudf +++ b/thirdparty/cudf @@ -1 +1 @@ -Subproject commit 3964950ba2fecf7f962917276058a6381d396246 +Subproject commit e345620ddaf5d8ac87e2428a84508ecfec2ba4f8