diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2019-03-15 15:38:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 15:38:42 -0400 |
| commit | 9428317aef119d4c97d8224eeea6077d35bb0530 (patch) | |
| tree | 8e5b161b5c15fbf2f35a3338ede82a921ba8f551 | |
| parent | 1922a2dd60280db176313db69ff564f76b49a026 (diff) | |
| download | jscu_refactor-9428317aef119d4c97d8224eeea6077d35bb0530.tar.gz | |
Add conda base env bin dir to path just prior to temp env. (#41)1.3.10
Fix missing escape of env dump filename; cleanup
| -rw-r--r-- | vars/utils.groovy | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/vars/utils.groovy b/vars/utils.groovy index f79b71b..5390929 100644 --- a/vars/utils.groovy +++ b/vars/utils.groovy @@ -490,11 +490,6 @@ def buildAndTest(config) { // If conda is present, dump the conda environment definition to a file. def conda_exe = '' local_conda = "${env.WORKSPACE}/miniconda/bin/conda" - //if (fileExists(local_conda)) { - // conda_exe = local_conda - //} else { - // conda_exe = sh(script:"which conda", returnStdout:true).trim() - //} system_conda_present = sh(script:"which conda", returnStatus:true) if (system_conda_present == 0) { @@ -503,8 +498,8 @@ def buildAndTest(config) { conda_exe = local_conda } if (conda_exe != '') { - println("About to dump environment: conda_env_dump_${config.name}.txt") - sh(script: "${conda_exe} list --explicit > conda_env_dump_${config.name}.txt") + println("About to dump environment: 'conda_env_dump_${config.name}.txt'") + sh(script: "${conda_exe} list --explicit > 'conda_env_dump_${config.name}.txt'") // Stash spec file for use on master node. stash includes: '**/conda_env_dump*', name: "conda_env_dump_${config.name}", useDefaultExcludes: false @@ -569,7 +564,7 @@ def processCondaPkgs(config, index) { config.env_vars.add(0, "CONDA_PYTHON_EXE=${conda_prefix}/bin/python") config.env_vars.add(0, "CONDA_DEFAULT_ENV=${env_name}") // Prepend the PATH var adjustment to the list that gets processed below. - def conda_path = "PATH=${conda_prefix}/bin:$PATH" + def conda_path = "PATH=${conda_prefix}/bin:${conda_root}/bin:$PATH" config.env_vars.add(0, conda_path) } return config |