diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2019-07-02 13:31:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-02 13:31:50 -0400 |
| commit | 823b70dd375ca29becf4f65a69e45c1f7910c425 (patch) | |
| tree | 4dff166d85bb9759200b39bb3f41befc0d85f548 | |
| parent | 45b8bd97d9aece8b4bc1e511b94cbcc1d5ec566e (diff) | |
| download | jscu_refactor-823b70dd375ca29becf4f65a69e45c1f7910c425.tar.gz | |
Select appropriate sed binary when on macos (#58)1.3.21
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rw-r--r-- | vars/utils.groovy | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 3bbc86f..a35f257 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -//@Library('utils@master') _ +//@Library('utils@sedtest') _ // [skip ci] and [ci skip] have no effect here. if (utils.scm_checkout(['skip_disable':true])) return diff --git a/vars/utils.groovy b/vars/utils.groovy index d636d1c..d0663ea 100644 --- a/vars/utils.groovy +++ b/vars/utils.groovy @@ -122,6 +122,7 @@ def installConda(version, install_dir) { if (uname == "Darwin") { OSname = "MacOSX" println("OSname=${OSname}") + env.PATH = "/sw/bin:$PATH" } if (uname == "Linux") { OSname = uname @@ -341,7 +342,7 @@ def processTestReport(config) { command = "cp '${repfile}' '${repfile}.modified'" sh(script:command) } - sh(script:"sed -i 's/ name=\"/ name=\"[${config.name}] /g' *.xml.modified") + sh(script: "sed -i 's/ name=\"/ name=\"[${config.name}] /g' *.xml.modified") step([$class: 'XUnitBuilder', thresholds: [ [$class: 'SkippedThreshold', unstableThreshold: "${config.skippedUnstableThresh}"], |