Skip to content

Commit

Permalink
Merge pull request #548 from abergeron/conda_libc
Browse files Browse the repository at this point in the history
Change base build image to accomodate for old libc.
  • Loading branch information
nouiz authored Oct 11, 2017
2 parents 0d3292e + ed3200f commit 65f34a1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
12 changes: 9 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
jobs:
build_pkgs:
docker:
- image: milaudem/libgpuarray:0
- image: joaander/conda-build:20170905

steps:
- checkout
Expand All @@ -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
Expand Down

0 comments on commit 65f34a1

Please sign in to comment.