diff --git a/.appveyor.yml b/.appveyor.yml index f1c3dfd..85b4596 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -22,7 +22,7 @@ environment: install: - set PATH=%PATH%;%PYTHON%/Scripts/ - pip.exe install conan --upgrade - - pip.exe install conan_package_tools + - pip.exe install conan_package_tools bincrafters_package_tools - conan user # It creates the conan data directory test_script: diff --git a/.travis/install.sh b/.ci/install.sh similarity index 61% rename from .travis/install.sh rename to .ci/install.sh index 9da0265..762b4b5 100644 --- a/.travis/install.sh +++ b/.ci/install.sh @@ -1,25 +1,24 @@ -#!/bin/bash +#!/usr/bin/env bash -set -e -set -x +set -ex if [[ "$(uname -s)" == 'Darwin' ]]; then brew update || brew update brew outdated pyenv || brew upgrade pyenv brew install pyenv-virtualenv - brew install cmake || true + brew install cmake || brew upgrade cmake || true if which pyenv > /dev/null; then eval "$(pyenv init -)" fi - pyenv install 2.7.10 - pyenv virtualenv 2.7.10 conan + pyenv install 3.7.1 + pyenv virtualenv 3.7.1 conan pyenv rehash pyenv activate conan fi pip install conan --upgrade -pip install conan_package_tools +pip install conan_package_tools bincrafters_package_tools conan user diff --git a/.travis/run.sh b/.ci/run.sh similarity index 85% rename from .travis/run.sh rename to .ci/run.sh index 0a3488e..3e39a35 100644 --- a/.travis/run.sh +++ b/.ci/run.sh @@ -1,7 +1,6 @@ -#!/bin/bash +#!/usr/bin/env bash -set -e -set -x +set -ex if [[ "$(uname -s)" == 'Darwin' ]]; then if which pyenv > /dev/null; then diff --git a/.travis.yml b/.travis.yml index 6cd96be..4941ec8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,14 +24,14 @@ osx: &osx matrix: include: - - <<: *linux - env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49 + # - <<: *linux + # env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49 - - <<: *linux - env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5 + # - <<: *linux + # env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5 - - <<: *linux - env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6 + # - <<: *linux + # env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6 - <<: *linux env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7 @@ -42,8 +42,8 @@ matrix: - <<: *linux env: CONAN_GCC_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/gcc9 - - <<: *linux - env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39 + # - <<: *linux + # env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39 - <<: *linux env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=conanio/clang40 @@ -81,9 +81,9 @@ matrix: env: CONAN_APPLE_CLANG_VERSIONS=10.0 install: - - chmod +x .travis/install.sh - - ./.travis/install.sh + - chmod +x .ci/install.sh + - ./.ci/install.sh script: - - chmod +x .travis/run.sh - - ./.travis/run.sh + - chmod +x .ci/run.sh + - ./.ci/run.sh diff --git a/build.py b/build.py index b27cf1e..29ce67f 100644 --- a/build.py +++ b/build.py @@ -1,9 +1,10 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from cpt.packager import ConanMultiPackager +from bincrafters import build_template_header_only if __name__ == "__main__": - builder = ConanMultiPackager() - builder.add_common_builds() + builder = build_template_header_only.get_builder() + additional_options = { 'nameof:build_tests': True, 'nameof:build_examples': True } + builder.update_build_if(lambda build: True, new_options=additional_options) builder.run()