diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abe6464f286242beecf08a61b8588a027c5c5865..f437abb0578ca69685857826a8b34343c0a0b89c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,7 +85,7 @@ test: - mkdir build - cd build - VERSION="$(conan inspect --raw version ..)" - - conan install -s "compiler.libcxx=libstdc++11" -o build_acm=True .. "caosdb/$VERSION" + - conan install -s "compiler.libcxx=libstdc++11" -o build_acm=True .. "caosdb/$VERSION@_/_" - cmake -DCMAKE_BUILD_TYPE=Debug .. - cmake --build . -j - cmake --build . -j --target unit_test_coverage diff --git a/Makefile b/Makefile index 544c8039b4f27ccef8b379d1009bfe9173666bc3..21cd43348cb545bfbf0acd8985dd0e3a459ca8f1 100644 --- a/Makefile +++ b/Makefile @@ -44,8 +44,10 @@ endif .PHONY: help help: @echo "Targets:" - @echo " conan-install - Install locally with Conan." @echo " style - auto-format the source files." + @echo " conan-install - Install locally with Conan." + @echo -e " conan-create - Create conan binary package in the local conan\n"\ + " repostory." style: $(CLANG_FORMAT) -i --verbose \ @@ -65,11 +67,12 @@ conan-install-debug: .PHONY: conan-install-debug conan-create: - conan create . -s $(CONAN_SETTINGS) + conan create -s $(CONAN_SETTINGS) -o caosdb:build_acm=True . "caosdb/$$(conan inspect --raw version .)@_/_" .PHONY: conan-create conan-create-debug: - conan create . -s $(CONAN_SETTINGS) -s build_type=Debug + conan create -s $(CONAN_SETTINGS) -s build_type=Debug -o caosdb:build_acm=True . "caosdb/$$(conan inspect --raw version .)@_/_" + .PHONY: conan-create-debug conan: conan-install conan-create