diff --git a/.drone.yml b/.drone.yml index ad4bc99..ad86657 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,8 +36,8 @@ steps: CONAN_PASSWORD: from_secret: conan_password commands: - - conan create . creaturelib/$DRONE_BRANCH + - conan create . $DRONE_COMMIT@creaturelib/$DRONE_BRANCH - conan remote add epsilon-public https://packages.p-epsilon.com/artifactory/api/conan/epsilon-public - conan user -p -r=epsilon-public - - conan upload CreatureLib/0.1@creaturelib/$DRONE_BRANCH --all -r=epsilon-public + - conan upload CreatureLib/$DRONE_COMMIT@creaturelib/$DRONE_BRANCH --all -r=epsilon-public - conan user --clean \ No newline at end of file diff --git a/conanfile.py b/conanfile.py index 8a5d65f..dd7cd13 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,4 +1,4 @@ -from conans import ConanFile, CMake, tools +from conans import ConanFile, CMake class HelloConan(ConanFile): @@ -12,10 +12,6 @@ class HelloConan(ConanFile): generators = "cmake" exports_sources = "*" - def set_version(self): - git = tools.Git(folder=self.recipe_folder) - self.version = "%s_%s" % (git.get_branch(), git.get_revision()) - def build(self): cmake = CMake(self) cmake.configure(source_folder=".")