Skip to content

Commit

Permalink
MNT: Updated the feedstock for conda-smithy version 0.10.3. (#3)
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
conda-forge-admin authored and frol committed May 16, 2016
1 parent 1b44848 commit 0240891
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ env:


before_install:
# Remove homebrew.
- brew remove --force $(brew list)
- brew cleanup -s
- rm -rf $(brew --cache)

install:
- |
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ Terminology

Current build status
====================

Linux: [![Circle CI](https://circleci.com/gh/conda-forge/colorlog-feedstock.svg?style=svg)](https://circleci.com/gh/conda-forge/colorlog-feedstock)
OSX: [![TravisCI](https://travis-ci.org/conda-forge/colorlog-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/colorlog-feedstock)
Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/colorlog-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/colorlog-feedstock/branch/master)
Expand Down
8 changes: 5 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# This file was automatically generated by conda-smithy. To update a component of this
# file, make changes to conda-forge.yaml and/or recipe/meta.yaml, and run
# "conda-smithy regenerate".
Expand All @@ -22,16 +21,19 @@ environment:
matrix:
- TARGET_ARCH: x86
CONDA_PY: 27

- TARGET_ARCH: x64
CONDA_PY: 27

- TARGET_ARCH: x86
CONDA_PY: 34

- TARGET_ARCH: x64
CONDA_PY: 34

- TARGET_ARCH: x86
CONDA_PY: 35

- TARGET_ARCH: x64
CONDA_PY: 35

Expand Down Expand Up @@ -60,8 +62,8 @@ install:
- cmd: set PYTHONUNBUFFERED=1

- cmd: conda config --set show_channel_urls true
- cmd: conda install -c http://conda.binstar.org/pelson/channel/development --yes --quiet obvious-ci
- cmd: conda config --add channels http://conda.binstar.org/conda-forge
- cmd: conda install -c pelson/channel/development --yes --quiet obvious-ci
- cmd: conda config --add channels conda-forge
- cmd: conda info
- cmd: conda install -n root --quiet --yes conda-build anaconda-client jinja2 setuptools
# Workaround for Python 3.4 and x64 bug in latest conda-build.
Expand Down
4 changes: 2 additions & 2 deletions ci_support/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cat << EOF | docker run -i \
-v ${RECIPE_ROOT}:/recipe_root \
-v ${FEEDSTOCK_ROOT}:/feedstock_root \
-a stdin -a stdout -a stderr \
pelson/obvious-ci:latest_x64 \
condaforge/linux-anvil \
bash || exit $?
export BINSTAR_TOKEN=${BINSTAR_TOKEN}
Expand All @@ -40,7 +40,7 @@ echo "$config" > ~/.condarc
conda clean --lock
conda update --yes --all
conda install --yes conda-build==1.18.2
conda install --yes conda-build
conda info
# Embarking on 3 case(s).
Expand Down
3 changes: 1 addition & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ dependencies:
# Note, we used to use the naive caching of docker images, but found that it was quicker
# just to pull each time. #rollondockercaching
override:
- docker pull pelson/obvious-ci:latest_x64
# - docker pull pelson/conda32_obvious_ci
- docker pull condaforge/linux-anvil

test:
override:
Expand Down

0 comments on commit 0240891

Please sign in to comment.