From 4902cd721586822ded795afe0c418c553137306a Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Tue, 27 Nov 2018 11:29:22 -0200 Subject: [PATCH] #926 Fix Conan package reference - Package channel should be changed automatically when matching the stable branch pattern - Update Bintray upload address Signed-off-by: Uilian Ries --- .conan/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.conan/build.py b/.conan/build.py index 1d7e5420..dfba2642 100644 --- a/.conan/build.py +++ b/.conan/build.py @@ -31,7 +31,7 @@ class BuilderSettings(object): not match the stable pattern. Otherwise it will upload to stable channel. """ - return os.getenv("CONAN_UPLOAD", "https://api.bintray.com/conan/horenmar/Catch2") + return os.getenv("CONAN_UPLOAD", "https://api.bintray.com/conan/catchorg/Catch2") @property def upload_only_when_stable(self): @@ -49,7 +49,7 @@ class BuilderSettings(object): def reference(self): """ Read project version from branch create Conan referece """ - return os.getenv("CONAN_REFERENCE", "Catch2/{}@{}/{}".format(self._version, self.username, self.channel)) + return os.getenv("CONAN_REFERENCE", "Catch2/{}".format(self._version)) @property def channel(self):