Skip to content

Commit

Permalink
MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.09.20
Browse files Browse the repository at this point in the history
  • Loading branch information
regro-cf-autotick-bot committed Sep 25, 2018
1 parent 1acfd16 commit d2e9000
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 5 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

0 comments on commit d2e9000

Please sign in to comment.