From f6672467008b159190dc83399e0be3a3b222a28a Mon Sep 17 00:00:00 2001 From: Arnaud Bergeron Date: Tue, 10 Oct 2017 14:59:04 -0400 Subject: [PATCH 1/3] Change base build image to accomodate for old libc. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 46fd53b800..0e9ae53451 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: build_pkgs: docker: - - image: milaudem/libgpuarray:0 + - image: joaander/conda-build:20170905 steps: - checkout From 39d37bdfda792324ce09feb090f6c80fdd443369 Mon Sep 17 00:00:00 2001 From: Arnaud Bergeron Date: Tue, 10 Oct 2017 15:42:24 -0400 Subject: [PATCH 2/3] Adjust path of artifacts. --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e9ae53451..09f05ff1ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,11 +27,11 @@ jobs: command: | if [[ -n "${CIRCLE_TAG}" ]] then - anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /miniconda/conda-bld/linux-64/libgpuarray* - anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /miniconda/conda-bld/linux-64/pygpu* + anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /opt/conda/conda-bld/linux-64/libgpuarray* + anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /opt/conda/conda-bld/linux-64/pygpu* fi - store_artifacts: - path: /miniconda/conda-bld/linux-64 + path: /opt/conda/conda-bld/linux-64 workflows: version: 2 From ed3200fdd048ccae7bd011da10aa0fe037dbd81f Mon Sep 17 00:00:00 2001 From: Arnaud Bergeron Date: Tue, 10 Oct 2017 16:12:32 -0400 Subject: [PATCH 3/3] Try to only patch VS2008 when required. --- .appveyor.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 839ae1a1ff..6f87c22b13 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -19,8 +19,11 @@ environment: matrix: - CONDA_LOC: "C:\\Miniconda-x64" + PATCH_VS2008: "1" - CONDA_LOC: "C:\\Miniconda35-x64" + PATCH_VS2008: "0" - CONDA_LOC: "C:\\Miniconda36-x64" + PATCH_VS2008: "0" install: # This breaks conda-build because of git @@ -29,9 +32,12 @@ install: - cmd: set PYTHONUNBUFFERED=1 - cmd: conda install -n root --yes conda conda-env conda-build anaconda-client # We borrow a trick from conda-forge to fix the VS2008 compiler - - cmd: conda config --append channels conda-forge - - cmd: conda install --yes vs2008_express_vc_python_patch - - cmd: call setup_x64 + - ps: | + if($env:PATCH_VS2008 -eq '1') { + cmd /c "conda config --append channels conda-forge 2>&1" + cmd /c "conda install --yes vs2008_express_vc_python_patch 2>&1" + cmd /c "call setup_x64 2>&1" + } build: off