From a396b035e0b793d8ec2dea4effc496511e0a6a85 Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <joscha@schmiedt.dev>
Date: Tue, 18 Jun 2024 21:08:06 +0200
Subject: [PATCH] Update CI/CD for Conan 2.0
---
.gitlab-ci.yml | 11 ++++++-----
Makefile | 10 +++++-----
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e4b424..e01d450 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,11 +86,12 @@ test:
tags: [ docker ]
stage: test
script:
- - mkdir build
- - cd build
- - VERSION="$(conan inspect --raw version ..)"
- - conan install -s "compiler.libcxx=libstdc++11" --build=missing -o build_acm=True .. "caosdb/$VERSION@_/_"
- - cmake -DCMAKE_BUILD_TYPE=Debug ..
+ # - mkdir build
+ # - cd build
+ # - VERSION="$(conan inspect --raw version ..)"
+ - conan install -s "compiler.libcxx=libstdc++11" --build=missing -o build_acm=True . #.. "caosdb/$VERSION@_/_"
+ - conan build -s "compiler.libcxx=libstdc++11" . --s build_type=Debug
+ - cd build/Debug
- cmake --build . -j
- cmake --build . -j --target unit_test_coverage
- cmake --build . -j --target cxxcaosdbcli
diff --git a/Makefile b/Makefile
index f86fdd1..991ee65 100644
--- a/Makefile
+++ b/Makefile
@@ -56,9 +56,9 @@ style:
.PHONY: style
conan-install-deps:
- conan install . -s $(CONAN_SETTINGS) || \
+ conan install . -s $(CONAN_SETTINGS) -s build_type=Release || \
(echo "'conan install' failed, trying to build from sources..."; \
- conan install . -s $(CONAN_SETTINGS) --build=missing)
+ conan install . -s $(CONAN_SETTINGS) -s build_type=Release --build=missing)
.PHONY: conan-install-deps
conan-install-debug:
@@ -68,11 +68,11 @@ conan-install-debug:
.PHONY: conan-install-debug
conan-create:
- conan create -s $(CONAN_SETTINGS) -o caosdb:build_acm=True . "caosdb/$$(conan inspect --raw version .)@_/_"
+ conan create -s $(CONAN_SETTINGS) -o caosdb:build_acm=True .
.PHONY: conan-create
conan-create-debug:
- conan create -s $(CONAN_SETTINGS) -s build_type=Debug -o caosdb:build_acm=True . "caosdb/$$(conan inspect --raw version .)@_/_"
+ conan create -s $(CONAN_SETTINGS) -s build_type=Debug -o caosdb:build_acm=True .
.PHONY: conan-create-debug
@@ -99,7 +99,7 @@ ctest:
cd build/Debug && ctest
test: conan-install-debug conan-build-debug ctest
-
+
clean:
rm -rf build
\ No newline at end of file
--
GitLab