Skip to content

Commit 65f34a1

Browse files
authored
Merge pull request #548 from abergeron/conda_libc
Change base build image to accomodate for old libc.
2 parents 0d3292e + ed3200f commit 65f34a1

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.appveyor.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@ environment:
1919

2020
matrix:
2121
- CONDA_LOC: "C:\\Miniconda-x64"
22+
PATCH_VS2008: "1"
2223
- CONDA_LOC: "C:\\Miniconda35-x64"
24+
PATCH_VS2008: "0"
2325
- CONDA_LOC: "C:\\Miniconda36-x64"
26+
PATCH_VS2008: "0"
2427

2528
install:
2629
# This breaks conda-build because of git
@@ -29,9 +32,12 @@ install:
2932
- cmd: set PYTHONUNBUFFERED=1
3033
- cmd: conda install -n root --yes conda conda-env conda-build anaconda-client
3134
# We borrow a trick from conda-forge to fix the VS2008 compiler
32-
- cmd: conda config --append channels conda-forge
33-
- cmd: conda install --yes vs2008_express_vc_python_patch
34-
- cmd: call setup_x64
35+
- ps: |
36+
if($env:PATCH_VS2008 -eq '1') {
37+
cmd /c "conda config --append channels conda-forge 2>&1"
38+
cmd /c "conda install --yes vs2008_express_vc_python_patch 2>&1"
39+
cmd /c "call setup_x64 2>&1"
40+
}
3541
3642
build: off
3743

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
jobs:
44
build_pkgs:
55
docker:
6-
- image: milaudem/libgpuarray:0
6+
- image: joaander/conda-build:20170905
77

88
steps:
99
- checkout
@@ -27,11 +27,11 @@ jobs:
2727
command: |
2828
if [[ -n "${CIRCLE_TAG}" ]]
2929
then
30-
anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /miniconda/conda-bld/linux-64/libgpuarray*
31-
anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /miniconda/conda-bld/linux-64/pygpu*
30+
anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /opt/conda/conda-bld/linux-64/libgpuarray*
31+
anaconda -t $BINSTAR_TOKEN upload --user=mila-udem /opt/conda/conda-bld/linux-64/pygpu*
3232
fi
3333
- store_artifacts:
34-
path: /miniconda/conda-bld/linux-64
34+
path: /opt/conda/conda-bld/linux-64
3535

3636
workflows:
3737
version: 2

0 commit comments

Comments
 (0)