From e3eedae68bc3343131db608c2041259ebb57d385 Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <joscha@schmiedt.dev>
Date: Tue, 18 Jun 2024 21:10:52 +0200
Subject: [PATCH] Add conan profile detection to CI/CD
---
.gitlab-ci.yml | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e01d450..afbcfd0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,15 +86,17 @@ test:
tags: [ docker ]
stage: test
script:
+ - conan profile detect
+ - make test
# - 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
+ # - 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
# - cmake --build . -j --target ccaosdbcli # Disabled until it compiles again.
trigger_prepare:
--
GitLab