From 01bc6046c25dc06d7878f5424f1aa8b860bb6b41 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 2 Jul 2021 01:38:37 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 7 ++-----
.gitlab-ci.yml | 2 +-
conanfile.txt | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index ef6a90e..19de848 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -7,10 +7,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
WORKDIR /libcaosdb/
RUN mkdir build
WORKDIR /libcaosdb/build
-RUN conan install .. --profile ../conan.profile
-RUN cmake ..
-RUN cmake --build .
-RUN cmake --install . --prefix /usr/local/
+RUN conan create .. --profile ../conan.profile
COPY . /caosdb-cppinttest
WORKDIR /caosdb-cppinttest
@@ -20,7 +17,7 @@ RUN rm -rf .git
CMD mkdir build && \
cd build && \
conan install .. --profile /libcaosdb/conan.profile \
- cmake -D CMAKE_PREFIX_PATH=/usr/local/ .. && \
+ cmake .. && \
cmake --build . && \
/wait-for-it.sh caosdb-server:10443 -t 500 -- \
ctest -V
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed27c9a..6693efe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,7 +111,7 @@ build-test:
- mkdir build
- cd build
- conan install .. --profile /libcaosdb/conan.profile
- - cmake -D CMAKE_PREFIX_PATH=/usr/local/ ..
+ - cmake ..
- cmake --build .
diff --git a/conanfile.txt b/conanfile.txt
index c0b69cd..3c18ff1 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -1,2 +1,2 @@
[requires]
-libcaosdb/0.0.1
+libcaosdb/0.0.2
--
GitLab