From 1acfd167fefb2b94d632f125da69a501ab3429b3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Tue, 25 Sep 2018 03:12:37 +0000 Subject: [PATCH 1/2] bump build number --- conda-forge.yml | 11 ++++++----- recipe/meta.yaml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 532a7f0..32065a9 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -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=} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c19c7ec..8b48f3e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,7 @@ source: - strcasecmp.patch build: - number: 0 + number: 1000 skip: True # [win and vc<14] requirements: From d2e900077dfa31bf3c7d7bf755cd0ae7432c8755 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Tue, 25 Sep 2018 03:12:59 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.09.20 --- .appveyor.yml | 2 +- .ci_support/linux_cxx_compilergxx.yaml | 21 ++++++++++++++++ ...l => linux_cxx_compilertoolchain_cxx.yaml} | 8 +++++++ .ci_support/osx_cxx_compilerclangxx.yaml | 24 +++++++++++++++++++ ...aml => osx_cxx_compilertoolchain_cxx.yaml} | 7 ++++++ .circleci/config.yml | 24 ++++++++++++++++--- .travis.yml | 3 ++- 7 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 .ci_support/linux_cxx_compilergxx.yaml rename .ci_support/{linux_.yaml => linux_cxx_compilertoolchain_cxx.yaml} (59%) create mode 100644 .ci_support/osx_cxx_compilerclangxx.yaml rename .ci_support/{osx_.yaml => osx_cxx_compilertoolchain_cxx.yaml} (68%) diff --git a/.appveyor.yml b/.appveyor.yml index 91d4010..098dfa1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -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 \ No newline at end of file diff --git a/.ci_support/linux_cxx_compilergxx.yaml b/.ci_support/linux_cxx_compilergxx.yaml new file mode 100644 index 0000000..f19221a --- /dev/null +++ b/.ci_support/linux_cxx_compilergxx.yaml @@ -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 diff --git a/.ci_support/linux_.yaml b/.ci_support/linux_cxx_compilertoolchain_cxx.yaml similarity index 59% rename from .ci_support/linux_.yaml rename to .ci_support/linux_cxx_compilertoolchain_cxx.yaml index 5a4bdcb..46f5344 100644 --- a/.ci_support/linux_.yaml +++ b/.ci_support/linux_cxx_compilertoolchain_cxx.yaml @@ -1,3 +1,5 @@ +build_number_decrement: +- '1000' channel_sources: - conda-forge,defaults channel_targets: @@ -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 diff --git a/.ci_support/osx_cxx_compilerclangxx.yaml b/.ci_support/osx_cxx_compilerclangxx.yaml new file mode 100644 index 0000000..464dd66 --- /dev/null +++ b/.ci_support/osx_cxx_compilerclangxx.yaml @@ -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 diff --git a/.ci_support/osx_.yaml b/.ci_support/osx_cxx_compilertoolchain_cxx.yaml similarity index 68% rename from .ci_support/osx_.yaml rename to .ci_support/osx_cxx_compilertoolchain_cxx.yaml index c2e5870..dc0c453 100644 --- a/.ci_support/osx_.yaml +++ b/.ci_support/osx_cxx_compilertoolchain_cxx.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +build_number_decrement: +- '1000' channel_sources: - conda-forge,defaults channel_targets: @@ -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 diff --git a/.circleci/config.yml b/.circleci/config.yml index ede1d94..4088ef8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: @@ -23,4 +40,5 @@ workflows: version: 2 build_and_test: jobs: - - build_linux_ + - build_linux_cxx_compilergxx + - build_linux_cxx_compilertoolchain_cxx diff --git a/.travis.yml b/.travis.yml index 5451214..7927252 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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.