diff --git a/.drone.yml b/.drone.yml index e41c0b9..abe6f66 100644 --- a/.drone.yml +++ b/.drone.yml @@ -84,7 +84,9 @@ steps: - rm -rf build-release-windows - conan remote add epsilon-public https://packages.p-epsilon.com/artifactory/api/conan/epsilon-public - cmake -DCMAKE_BUILD_TYPE=Release . -B build-conan -D CMAKE_C_COMPILER=/usr/bin/clang -D CMAKE_CXX_COMPILER=clang++ -DWINDOWS=0 - - conan export-pkg . $DRONE_COMMIT@pkmnlib/$DRONE_BRANCH --build-folder build-conan -s compiler='clang' -s compiler.version=8 -s compiler.libcxx='libstdc++11' + - conan export-pkg . $DRONE_COMMIT@epsilon/$DRONE_BRANCH --build-folder build-conan -s compiler='clang' -s compiler.version=8 -s compiler.libcxx='libstdc++11' + - conan alias PkmnLib/latest@epsilon/$DRONE_BRANCH PkmnLib/$DRONE_COMMIT@epsilon/$DRONE_BRANCH - conan user -p -r=epsilon-public - - conan upload PkmnLib/$DRONE_COMMIT@pkmnlib/$DRONE_BRANCH --all -r=epsilon-public --force + - conan upload PkmnLib/$DRONE_COMMIT@epsilon/$DRONE_BRANCH --all -r=epsilon-public --force + - conan upload PkmnLib/latest@epsilon/$DRONE_BRANCH --all -r=epsilon-public --force - conan user --clean \ No newline at end of file diff --git a/conanfile.py b/conanfile.py index 66e9490..a67f642 100644 --- a/conanfile.py +++ b/conanfile.py @@ -45,7 +45,7 @@ class PkmnLibConan(ConanFile): self.options["AngelScript"].link_std_statically = True def requirements(self): - self.requires("CreatureLib/5f891cd4edb72e948d5c63f518c5d6eeeb52dd74@creaturelib/master") + self.requires("CreatureLib/latest@epsilon/master") if self.options.script_handler == "angelscript": self.requires("AngelScript/2.34@AngelScript/Deukhoofd") else: