#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 <[email protected]>
catchorg · Nov 28, 2018 · 4902cd7 · 4902cd7
1 parent 18ff347
commit 4902cd7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.conan/build.py b/.conan/build.py
@@ -31,7 +31,7 @@ def upload(self):
             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 @@ def stable_branch_pattern(self):
     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):