Skip to content

Commit

Permalink
Merge pull request conda-forge#14 from regro-cf-autotick-bot/rebuild
Browse files Browse the repository at this point in the history
Rebuild for Python 3.7, GCC 7, R 3.5.1, openBLAS 0.3.2
  • Loading branch information
ocefpaf authored Sep 27, 2018
2 parents f7f27c2 + d2e9000 commit e29fcce
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ build: off
test_script:
- conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet
deploy_script:
- cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml
- cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml
21 changes: 21 additions & 0 deletions .ci_support/linux_cxx_compilergxx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
build_number_decrement:
- '0'
channel_sources:
- conda-forge/label/gcc7,defaults
channel_targets:
- conda-forge gcc7
cxx_compiler:
- gxx
docker_image:
- conda/c3i-linux-64
libxml2:
- '2.9'
pin_run_as_build:
libxml2:
max_pin: x.x
zip_keys:
- - cxx_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
build_number_decrement:
- '1000'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -11,3 +13,9 @@ libxml2:
pin_run_as_build:
libxml2:
max_pin: x.x
zip_keys:
- - cxx_compiler
- channel_sources
- channel_targets
- docker_image
- build_number_decrement
24 changes: 24 additions & 0 deletions .ci_support/osx_cxx_compilerclangxx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
build_number_decrement:
- '0'
channel_sources:
- conda-forge/label/gcc7,defaults
channel_targets:
- conda-forge gcc7
cxx_compiler:
- clangxx
libxml2:
- '2.9'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
pin_run_as_build:
libxml2:
max_pin: x.x
zip_keys:
- - cxx_compiler
- channel_sources
- channel_targets
- build_number_decrement
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
build_number_decrement:
- '1000'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -15,3 +17,8 @@ macos_min_version:
pin_run_as_build:
libxml2:
max_pin: x.x
zip_keys:
- - cxx_compiler
- channel_sources
- channel_targets
- build_number_decrement
24 changes: 21 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,28 @@
version: 2

jobs:
build_linux_:
build_linux_cxx_compilergxx:
working_directory: ~/test
machine: true
environment:
- CONFIG: "linux_"
- CONFIG: "linux_cxx_compilergxx"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./.circleci/fast_finish_ci_pr_build.sh
./.circleci/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: ./.circleci/run_docker_build.sh
build_linux_cxx_compilertoolchain_cxx:
working_directory: ~/test
machine: true
environment:
- CONFIG: "linux_cxx_compilertoolchain_cxx"
steps:
- checkout
- run:
Expand All @@ -23,4 +40,5 @@ workflows:
version: 2
build_and_test:
jobs:
- build_linux_
- build_linux_cxx_compilergxx
- build_linux_cxx_compilertoolchain_cxx
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ osx_image: xcode6.4

env:
matrix:
- CONFIG=osx_
- CONFIG=osx_cxx_compilerclangxx
- CONFIG=osx_cxx_compilertoolchain_cxx

global:
# The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
Expand Down
11 changes: 6 additions & 5 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
travis:
secure:
BINSTAR_TOKEN: A4for0evHe19MIe10Ah8k2hhIYXK1IiCYM91f/WaKYKSly4BSoYGRh0Sb9hxiiChSjeQL5dkodMdHXSEHMvz9EaKJL2SsKaOL6Hc4z9arOR6+XEklhlT2MwYBH+DlyQYmFAu5Zc3KgH8yy7AEl6s92Wo+CvpNBI+IALuiumECYJxBhDyodquPT8WOZvZ+PxJx78rdopbQ1nsAp5lqX1RIcBEDRlw8EsnBu0RSkyYFK+uSbe6xH0yhOTSbBJbBjRC9FUPbabPZA4IWpOjFZAUzI0iDbjwImBOB/fLox6vK2GM/jur/KJ0ftMd70fUV3QbOQTQTuSRkfXeh+x6rh2RTDhiqey+lWLA3WGl6+UY1S1AApoRx4fSLdnfvnRaw+oAOsps3P+9v/KxYrzzuAPlMjkf3xpnvJ2zDG7f1hs1jJvmsI5MbmW6n29HEkBGjmOlYth4/yXJCLRWTeZ9C8Hfx18aoFwTYw8rDWdxtekKtWfT2v9+vll5/wO7LEAawiIdaAiJOyIKjPRsXokV6beZsOUoEQI0asvhxz/g+RQSMUNbCMjyqF6arlslrKdnudYSrRwQdmtPDKsNx5RyW02WH1jaAscVKWBOMjSvx3+aKylIi0LzQCB95/MAmnYopjr6hrD3wsM1j0zXn2JfQNn+1IP/0+6cJhEj2F6cuA5QK2U=
appveyor:
secure:
BINSTAR_TOKEN: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1
secure: {BINSTAR_TOKEN: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1}
compiler_stack: comp7
max_py_ver: '37'
max_r_ver: '35'
travis:
secure: {BINSTAR_TOKEN: A4for0evHe19MIe10Ah8k2hhIYXK1IiCYM91f/WaKYKSly4BSoYGRh0Sb9hxiiChSjeQL5dkodMdHXSEHMvz9EaKJL2SsKaOL6Hc4z9arOR6+XEklhlT2MwYBH+DlyQYmFAu5Zc3KgH8yy7AEl6s92Wo+CvpNBI+IALuiumECYJxBhDyodquPT8WOZvZ+PxJx78rdopbQ1nsAp5lqX1RIcBEDRlw8EsnBu0RSkyYFK+uSbe6xH0yhOTSbBJbBjRC9FUPbabPZA4IWpOjFZAUzI0iDbjwImBOB/fLox6vK2GM/jur/KJ0ftMd70fUV3QbOQTQTuSRkfXeh+x6rh2RTDhiqey+lWLA3WGl6+UY1S1AApoRx4fSLdnfvnRaw+oAOsps3P+9v/KxYrzzuAPlMjkf3xpnvJ2zDG7f1hs1jJvmsI5MbmW6n29HEkBGjmOlYth4/yXJCLRWTeZ9C8Hfx18aoFwTYw8rDWdxtekKtWfT2v9+vll5/wO7LEAawiIdaAiJOyIKjPRsXokV6beZsOUoEQI0asvhxz/g+RQSMUNbCMjyqF6arlslrKdnudYSrRwQdmtPDKsNx5RyW02WH1jaAscVKWBOMjSvx3+aKylIi0LzQCB95/MAmnYopjr6hrD3wsM1j0zXn2JfQNn+1IP/0+6cJhEj2F6cuA5QK2U=}
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ source:
- strcasecmp.patch

build:
number: 0
number: 1000
skip: True # [win and vc<14]

requirements:
Expand Down

0 comments on commit e29fcce

Please sign in to comment.