mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 05:16:10 +01:00
#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 <uilianries@gmail.com>
This commit is contained in:
parent
18ff34788c
commit
4902cd7215
@ -31,7 +31,7 @@ class BuilderSettings(object):
|
|||||||
not match the stable pattern. Otherwise it will upload to stable
|
not match the stable pattern. Otherwise it will upload to stable
|
||||||
channel.
|
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
|
@property
|
||||||
def upload_only_when_stable(self):
|
def upload_only_when_stable(self):
|
||||||
@ -49,7 +49,7 @@ class BuilderSettings(object):
|
|||||||
def reference(self):
|
def reference(self):
|
||||||
""" Read project version from branch create Conan referece
|
""" 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
|
@property
|
||||||
def channel(self):
|
def channel(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user