From 870a3aeeca26093cb68498daee71688dab4049b3 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 30 Jun 2021 19:25:40 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 1 +
.gitlab-ci.yml | 1 +
2 files changed, 2 insertions(+)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 6472d2e..bc8753d 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -7,6 +7,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
WORKDIR /libcaosdb/
RUN mkdir build
WORKDIR /libcaosdb/build
+RUN conan install ..
RUN cmake ..
RUN cmake --build .
RUN cmake --install . --prefix /usr/local/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b67a002..8d62dda 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,6 +130,7 @@ build-test:
- echo $PWD
- mkdir build
- cd build
+ - conan install ..
- cmake ..
- cmake --build .
--
GitLab