From 98aaadd0d686909a7040d549b851cb4ccb790ef0 Mon Sep 17 00:00:00 2001
From: Matt Rendina <rendinam@users.noreply.github.com>
Date: Mon, 17 Jun 2019 17:27:27 -0400
Subject: Traverse to clone subdir for execution of git log command (#54)

Document dir blocks.

Remove lib override
---
 vars/utils.groovy | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'vars/utils.groovy')

diff --git a/vars/utils.groovy b/vars/utils.groovy
index 2232325..2fb8fe5 100644
--- a/vars/utils.groovy
+++ b/vars/utils.groovy
@@ -58,16 +58,18 @@ def scm_checkout(args = ['skip_disable':false]) {
             sh "mkdir clone"
             stat = sh(script: "shopt -s dotglob; mv * clone", returnStatus: true)
             println("args['skip_disable'] = ${args['skip_disable']}")
-            if (args['skip_disable'] == false) {
-                // Obtain the last commit message and examine it for skip directives.
-                logoutput = sh(script:"git log -1 --pretty=%B", returnStdout: true).trim()
-                if (logoutput.contains("[ci skip]") || logoutput.contains("[skip ci]")) {
-                    skip_job = 1
-                    currentBuild.result = 'SUCCESS'
-                    println("\nBuild skipped due to commit message directive.\n")
-                    return skip_job
+            dir('clone') {
+                if (args['skip_disable'] == false) {
+                    // Obtain the last commit message and examine it for skip directives.
+                    logoutput = sh(script:"git log -1 --pretty=%B", returnStdout: true).trim()
+                    if (logoutput.contains("[ci skip]") || logoutput.contains("[skip ci]")) {
+                        skip_job = 1
+                        currentBuild.result = 'SUCCESS'
+                        println("\nBuild skipped due to commit message directive.\n")
+                        return skip_job
+                    }
                 }
-            }
+            } //end dir(...
             stash includes: '**/*', name: 'source_tree', useDefaultExcludes: false
         }
     }
@@ -310,7 +312,7 @@ def publishCondaEnv(jobconfig, test_info) {
             } else {
                 pushToArtifactory("conda_env_dump_*", pub_repo)
             }
-        }
+        } // end dir(...
     }
 }
 
-- 
cgit