Skip to content

Commit

Permalink
MNT: Re-rendered with conda-smithy 2.4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
asmeurer committed Mar 30, 2018
1 parent b7d6e72 commit 18ce11f
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
24 changes: 24 additions & 0 deletions .circleci/config.yml
@@ -0,0 +1,24 @@
version: 2

jobs:
build:
working_directory: ~/test
machine: true
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh

workflows:
version: 2
build_and_test:
jobs:
- build
2 changes: 2 additions & 0 deletions .gitattributes
@@ -1,5 +1,7 @@
* text=auto

*.patch binary
*.diff binary
meta.yaml text eol=lf
build.sh text eol=lf
bld.bat text eol=crlf
3 changes: 2 additions & 1 deletion README.md
Expand Up @@ -66,6 +66,7 @@ To manage the continuous integration and simplify feedstock maintenance
Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of
this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``.

For more information please check the [conda-forge documentation](https://conda-forge.org/docs/).

Terminology
===========
Expand Down Expand Up @@ -100,4 +101,4 @@ In order to produce a uniquely identifiable distribution:
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string).
* If the version of a package **is** being increased, please remember to return
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string)
back to 0.
back to 0.
12 changes: 2 additions & 10 deletions ci_support/run_docker_build.sh
Expand Up @@ -57,17 +57,9 @@ conda clean --lock
conda install --yes --quiet conda-forge-build-setup
source run_conda_forge_build_setup
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
# Install the yum requirements defined canonically in the
# "recipe/yum_requirements.txt" file. After updating that file,
# run "conda smithy rerender" and this line be updated
# automatically.
/usr/bin/sudo -n yum install -y libXaw-devel
# Embarking on 1 case(s).
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
touch /feedstock_root/build_artefacts/conda-forge-build-done
EOF

Expand Down
19 changes: 0 additions & 19 deletions circle.yml

This file was deleted.

0 comments on commit 18ce11f

Please sign in to comment.