From 810fc615b4b821f4a76e82d3668d8e12ecc883bc Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Sun, 7 Apr 2019 12:38:36 +0200 Subject: [PATCH] Most of the environment variables moved from .travis.yml to build.py --- .travis.yml | 6 ------ build.py | 8 ++++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 41deee46..7e4a48d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,5 @@ env: global: - - CONAN_USERNAME: "mpusz" - - CONAN_LOGIN_USERNAME: "mpusz" - - CONAN_CHANNEL: "testing" - - CONAN_UPLOAD: "https://api.bintray.com/conan/mpusz/conan-mpusz" - - CONAN_STABLE_BRANCH_PATTERN: "release/*" - - CONAN_UPLOAD_ONLY_WHEN_STABLE: 0 - CONAN_DOCKER_32_IMAGES: 1 linux: &linux diff --git a/build.py b/build.py index d3e6d0cc..f8b6c451 100644 --- a/build.py +++ b/build.py @@ -1,6 +1,10 @@ from cpt.packager import ConanMultiPackager if __name__ == "__main__": - builder = ConanMultiPackager(remotes="https://api.bintray.com/conan/mpusz/conan-mpusz, https://api.bintray.com/conan/martinmoene/nonstd-lite") - builder.add_common_builds(shared_option_name=False, pure_c=False) + builder = ConanMultiPackager(username="mpusz", login_username="mpusz", + channel="testing", + stable_branch_pattern="release/*", + upload="https://api.bintray.com/conan/mpusz/conan-mpusz", + remotes="https://api.bintray.com/conan/martinmoene/nonstd-lite") + builder.add_common_builds(pure_c=False) builder.run()