Deukhoofd
/
CreatureLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change version usage for conan
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2019-12-19 16:09:02 +01:00
parent 9b198e67a7
commit f725d89ebc
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.drone.yml
View File

@ -36,8 +36,8 @@ steps:
CONAN_PASSWORD: CONAN_PASSWORD:
from_secret: conan_password from_secret: conan_password
commands: 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 remote add epsilon-public https://packages.p-epsilon.com/artifactory/api/conan/epsilon-public
- conan user -p -r=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 - conan user --clean

6
conanfile.py
View File

@ -1,4 +1,4 @@
from conans import ConanFile, CMake, tools from conans import ConanFile, CMake
class HelloConan(ConanFile): class HelloConan(ConanFile):
@ -12,10 +12,6 @@ class HelloConan(ConanFile):
generators = "cmake" generators = "cmake"
exports_sources = "*" 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): def build(self):
cmake = CMake(self) cmake = CMake(self)
cmake.configure(source_folder=".") cmake.configure(source_folder=".")