From d8f1c30ea0cfb240e936ef0a3b7f1cdaec36e483 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 6 Jul 2021 10:15:24 +0200
Subject: [PATCH] WIP: conan
---
.docker/Dockerfile | 4 ++--
.gitlab-ci.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 4bf263f..47cacfa 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -7,7 +7,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
WORKDIR /libcaosdb/
RUN mkdir build
WORKDIR /libcaosdb/build
-RUN conan create .. --profile ../conan.profile
+RUN conan create .. -s "compiler.libcxx=libstdc++11"
COPY . /caosdb-cppinttest
WORKDIR /caosdb-cppinttest
@@ -16,7 +16,7 @@ RUN rm -rf .git
# build and run tests
CMD mkdir build && \
cd build && \
- conan install .. --profile /libcaosdb/conan.profile && \
+ conan install .. -s "compiler.libcxx=libstdc++11" && \
cmake .. && \
cmake --build . && \
/wait-for-it.sh caosdb-server:10443 -t 500 -- \
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2691a4a..3d00565 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,7 +97,7 @@ build-test:
- echo $PWD
- mkdir build
- cd build
- - conan install .. --profile /libcaosdb/conan.profile
+ - conan install .. -s "compiler.libcxx=libstdc++11"
- cmake ..
- cmake --build .
--
GitLab