Merge pull request NVIDIA#1486 from NVIDIA/bot-auto-merge-branch-23.10

[auto-merge] bot-auto-merge-branch-23.10 to branch-23.12 [skip ci] [bot]
tgravescs · Oct 10, 2023 · 57c71b9 · 57c71b9
2 parents 6dd74fc + 6106e62
commit 57c71b9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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
                         }