Skip to content

Commit 59c1a04

Browse files
mgxdmgxd
committed
Merge branch 'rel/1.0.0' of https://github.com/mgxd/nipype-feedstock into rel/1.0.0
2 parents 11b6a7a + c40a83a commit 59c1a04

File tree

6 files changed

+89
-45
lines changed

6 files changed

+89
-45
lines changed

‎.circleci/config.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
version: 2
2+
3+
jobs:
4+
build__CONDA_PY_27:
5+
working_directory: ~/test
6+
machine: true
7+
environment:
8+
- CONDA_PY: "27"
9+
steps:
10+
- checkout
11+
- run:
12+
name: Fast finish outdated PRs and merge PRs
13+
command: |
14+
./ci_support/fast_finish_ci_pr_build.sh
15+
./ci_support/checkout_merge_commit.sh
16+
- run:
17+
command: docker pull condaforge/linux-anvil
18+
- run:
19+
name: Print conda-build environment variables
20+
command: |
21+
echo "CONDA_PY=${CONDA_PY}"
22+
- run:
23+
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
24+
command: ./ci_support/run_docker_build.sh
25+
build__CONDA_PY_35:
26+
working_directory: ~/test
27+
machine: true
28+
environment:
29+
- CONDA_PY: "35"
30+
steps:
31+
- checkout
32+
- run:
33+
name: Fast finish outdated PRs and merge PRs
34+
command: |
35+
./ci_support/fast_finish_ci_pr_build.sh
36+
./ci_support/checkout_merge_commit.sh
37+
- run:
38+
command: docker pull condaforge/linux-anvil
39+
- run:
40+
name: Print conda-build environment variables
41+
command: |
42+
echo "CONDA_PY=${CONDA_PY}"
43+
- run:
44+
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
45+
command: ./ci_support/run_docker_build.sh
46+
build__CONDA_PY_36:
47+
working_directory: ~/test
48+
machine: true
49+
environment:
50+
- CONDA_PY: "36"
51+
steps:
52+
- checkout
53+
- run:
54+
name: Fast finish outdated PRs and merge PRs
55+
command: |
56+
./ci_support/fast_finish_ci_pr_build.sh
57+
./ci_support/checkout_merge_commit.sh
58+
- run:
59+
command: docker pull condaforge/linux-anvil
60+
- run:
61+
name: Print conda-build environment variables
62+
command: |
63+
echo "CONDA_PY=${CONDA_PY}"
64+
- run:
65+
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
66+
command: ./ci_support/run_docker_build.sh
67+
68+
workflows:
69+
version: 2
70+
build_and_test:
71+
jobs:
72+
- build__CONDA_PY_27
73+
- build__CONDA_PY_35
74+
- build__CONDA_PY_36

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
* text=auto
22

3+
*.patch binary
4+
*.diff binary
35
meta.yaml text eol=lf
46
build.sh text eol=lf
57
bld.bat text eol=crlf

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ To manage the continuous integration and simplify feedstock maintenance
6666
Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of
6767
this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``.
6868

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

7071
Terminology
7172
===========
@@ -100,4 +101,4 @@ In order to produce a uniquely identifiable distribution:
100101
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string).
101102
* If the version of a package **is** being increased, please remember to return
102103
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string)
103-
back to 0.
104+
back to 0.

‎appveyor.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,24 @@ install:
5151

5252
# Add path, activate `conda` and update conda.
5353
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
54-
- cmd: conda update --yes --quiet conda
54+
- cmd: conda.exe update --yes --quiet conda
5555

5656
- cmd: set PYTHONUNBUFFERED=1
5757

5858
# Add our channels.
59-
- cmd: conda config --set show_channel_urls true
60-
- cmd: conda config --remove channels defaults
61-
- cmd: conda config --add channels defaults
62-
- cmd: conda config --add channels conda-forge
59+
- cmd: conda.exe config --set show_channel_urls true
60+
- cmd: conda.exe config --remove channels defaults
61+
- cmd: conda.exe config --add channels defaults
62+
- cmd: conda.exe config --add channels conda-forge
6363

6464
# Configure the VM.
65-
- cmd: conda install -n root --quiet --yes conda-forge-build-setup
65+
- cmd: conda.exe install -n root --quiet --yes conda-forge-build-setup
6666
- cmd: run_conda_forge_build_setup
6767

6868
# Skip .NET project specific build phase.
6969
build: off
7070

7171
test_script:
72-
- conda build recipe --quiet
72+
- conda.exe build recipe --quiet
7373
deploy_script:
7474
- cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main

‎ci_support/run_docker_build.sh

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ cat << EOF | docker run -i \
4040
-v "${RECIPE_ROOT}":/recipe_root \
4141
-v "${FEEDSTOCK_ROOT}":/feedstock_root \
4242
-e HOST_USER_ID="${HOST_USER_ID}" \
43+
-e CONDA_PY="${CONDA_PY}" \
4344
-a stdin -a stdout -a stderr \
4445
condaforge/linux-anvil \
4546
bash || exit 1
@@ -57,24 +58,9 @@ conda clean --lock
5758
conda install --yes --quiet conda-forge-build-setup
5859
source run_conda_forge_build_setup
5960
60-
# Embarking on 3 case(s).
61-
set -x
62-
export CONDA_PY=27
63-
set +x
64-
conda build /recipe_root --quiet || exit 1
65-
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
66-
67-
set -x
68-
export CONDA_PY=35
69-
set +x
70-
conda build /recipe_root --quiet || exit 1
71-
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
72-
73-
set -x
74-
export CONDA_PY=36
75-
set +x
76-
conda build /recipe_root --quiet || exit 1
77-
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
61+
conda build /recipe_root --quiet || exit 1
62+
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
63+
7864
touch /feedstock_root/build_artefacts/conda-forge-build-done
7965
EOF
8066

‎circle.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)