diff options
| author | Matt Rendina <rendinam@users.noreply.github.com> | 2017-04-24 15:23:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 15:23:30 -0400 |
| commit | 9e3af5b2c3f17190c6a62440b153a52f80d2a2d9 (patch) | |
| tree | e2d509a97ee580881f0ed57c84d75c34afb06296 /jenkins/dispatch.groovy | |
| parent | ad13f9a34cf6c6309f303fc09cda8dfcbac440a3 (diff) | |
| parent | 9cd9a4f9e8cead821bb6750ae26a612cfded443d (diff) | |
| download | build_control-9e3af5b2c3f17190c6a62440b153a52f80d2a2d9.tar.gz | |
Merge pull request #10 from rendinam/flags_and_patching
Flags and patching update, misc manifest and parameter updates
Diffstat (limited to 'jenkins/dispatch.groovy')
| -rw-r--r-- | jenkins/dispatch.groovy | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 4ba44fd..f48022e 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -75,7 +75,7 @@ node(LABEL) { println("PATH = ${env.PATH}") // Fetch the manifest files - git url: BUILD_CONTROL_REPO + git branch: BUILD_CONTROL_BRANCH, url: BUILD_CONTROL_REPO // Check for the availability of a download tool and then use it // to get the conda installer. @@ -107,11 +107,11 @@ node(LABEL) { sh "conda install --quiet --yes conda-build=${CONDA_BUILD_VERSION}" // Apply bugfix patch to conda_build 2.1.1 + def filename = "${env.WORKSPACE}/miniconda/lib/python${PY_VERSION}/site-packages/conda_build/config.py" def patches_dir = "${env.WORKSPACE}/patches" - def patch = "${patches_dir}/conda_build_2.1.1_substr_fix_py${this.py_maj_version}.patch" - dir("miniconda/lib/python${PY_VERSION}/site-packages/conda/conda_build") { - sh "patch ${patch}" - } + def patchname = "conda_build_2.1.1_substr_fix_py${this.py_maj_version}.patch" + def full_patchname = "${patches_dir}/${patchname}" + sh "patch ${filename} ${full_patchname}" this.manifest = readYaml file: "manifests/${MANIFEST_FILE}" if (this.manifest.channel_URL[-1..-1] == "/") { |