update ci scripts
This commit is contained in:
parent
1aea83279c
commit
9c5ae69b36
5 changed files with 25 additions and 26 deletions
|
@ -22,7 +22,7 @@ environment:
|
||||||
install:
|
install:
|
||||||
- set PATH=%PATH%;%PYTHON%/Scripts/
|
- set PATH=%PATH%;%PYTHON%/Scripts/
|
||||||
- pip.exe install conan --upgrade
|
- 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
|
- conan user # It creates the conan data directory
|
||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
|
|
|
@ -1,25 +1,24 @@
|
||||||
#!/bin/bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
set -e
|
set -ex
|
||||||
set -x
|
|
||||||
|
|
||||||
if [[ "$(uname -s)" == 'Darwin' ]]; then
|
if [[ "$(uname -s)" == 'Darwin' ]]; then
|
||||||
brew update || brew update
|
brew update || brew update
|
||||||
brew outdated pyenv || brew upgrade pyenv
|
brew outdated pyenv || brew upgrade pyenv
|
||||||
brew install pyenv-virtualenv
|
brew install pyenv-virtualenv
|
||||||
brew install cmake || true
|
brew install cmake || brew upgrade cmake || true
|
||||||
|
|
||||||
if which pyenv > /dev/null; then
|
if which pyenv > /dev/null; then
|
||||||
eval "$(pyenv init -)"
|
eval "$(pyenv init -)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pyenv install 2.7.10
|
pyenv install 3.7.1
|
||||||
pyenv virtualenv 2.7.10 conan
|
pyenv virtualenv 3.7.1 conan
|
||||||
pyenv rehash
|
pyenv rehash
|
||||||
pyenv activate conan
|
pyenv activate conan
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pip install conan --upgrade
|
pip install conan --upgrade
|
||||||
pip install conan_package_tools
|
pip install conan_package_tools bincrafters_package_tools
|
||||||
|
|
||||||
conan user
|
conan user
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
set -e
|
set -ex
|
||||||
set -x
|
|
||||||
|
|
||||||
if [[ "$(uname -s)" == 'Darwin' ]]; then
|
if [[ "$(uname -s)" == 'Darwin' ]]; then
|
||||||
if which pyenv > /dev/null; then
|
if which pyenv > /dev/null; then
|
24
.travis.yml
24
.travis.yml
|
@ -24,14 +24,14 @@ osx: &osx
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- <<: *linux
|
# - <<: *linux
|
||||||
env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49
|
# env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49
|
||||||
|
|
||||||
- <<: *linux
|
# - <<: *linux
|
||||||
env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5
|
# env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5
|
||||||
|
|
||||||
- <<: *linux
|
# - <<: *linux
|
||||||
env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6
|
# env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6
|
||||||
|
|
||||||
- <<: *linux
|
- <<: *linux
|
||||||
env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7
|
env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7
|
||||||
|
@ -42,8 +42,8 @@ matrix:
|
||||||
- <<: *linux
|
- <<: *linux
|
||||||
env: CONAN_GCC_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/gcc9
|
env: CONAN_GCC_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/gcc9
|
||||||
|
|
||||||
- <<: *linux
|
# - <<: *linux
|
||||||
env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39
|
# env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39
|
||||||
|
|
||||||
- <<: *linux
|
- <<: *linux
|
||||||
env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=conanio/clang40
|
env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=conanio/clang40
|
||||||
|
@ -81,9 +81,9 @@ matrix:
|
||||||
env: CONAN_APPLE_CLANG_VERSIONS=10.0
|
env: CONAN_APPLE_CLANG_VERSIONS=10.0
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- chmod +x .travis/install.sh
|
- chmod +x .ci/install.sh
|
||||||
- ./.travis/install.sh
|
- ./.ci/install.sh
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- chmod +x .travis/run.sh
|
- chmod +x .ci/run.sh
|
||||||
- ./.travis/run.sh
|
- ./.ci/run.sh
|
||||||
|
|
7
build.py
7
build.py
|
@ -1,9 +1,10 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
from cpt.packager import ConanMultiPackager
|
from bincrafters import build_template_header_only
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
builder = ConanMultiPackager()
|
builder = build_template_header_only.get_builder()
|
||||||
builder.add_common_builds()
|
additional_options = { 'nameof:build_tests': True, 'nameof:build_examples': True }
|
||||||
|
builder.update_build_if(lambda build: True, new_options=additional_options)
|
||||||
builder.run()
|
builder.run()
|
||||||
|
|
Loading…
Reference in a new issue