From c6c6112161d726a7673feacf69e6b6e4782c6e84 Mon Sep 17 00:00:00 2001 From: Balazs Benics Date: Sun, 28 Jul 2019 15:37:33 +0200 Subject: [PATCH] try ConanMultiPacker --- appveyor.yml | 9 +++++++++ build.py | 15 +++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1144398..20a78c4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,6 +3,15 @@ build: false environment: PYTHON: "C:\\Python37" + CONAN_UPLOAD: "https://api.bintray.com/conan/steakhal/development" + CONAN_BUILD_POLICY: "missing" + CONAN_USERNAME: "steakhal" + CONAN_DOCKER_32_IMAGES: 1 + CONAN_CHANNEL: "testing" + # CONAN_UPLOAD_DEPENDENCIES="all" + CONAN_STABLE_BRANCH_PATTERN: "release/*" + CONAN_UPLOAD_ONLY_WHEN_STABLE: 1 + matrix: - MINGW_CONFIGURATIONS: '7@x86_64@seh@posix, 7@x86@seh@posix, 8@x86_64@seh@posix, 8@x86@seh@posix' - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 diff --git a/build.py b/build.py index 29ce67f..accf73a 100644 --- a/build.py +++ b/build.py @@ -1,10 +1,17 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from bincrafters import build_template_header_only +from cpt.packager import ConanMultiPackager if __name__ == "__main__": - 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 = ConanMultiPackager() + builder.add_common_builds() + updated_builds = [] + for settings, options, env_vars, build_requires, reference in builder.items: + options['prometheus-cpp:mode'] = 'pull' + updated_builds.append([settings, options, env_vars, build_requires]) + options = options.copy() + options['prometheus-cpp:mode'] = 'push' + updated_builds.append([settings, options, env_vars, build_requires]) + builder.builds = updated_builds builder.run()