From 0340d0a9fd36fe7fc2841cd7e4074dcdc6c6e2cf Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 30 Jun 2021 12:59:23 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 2 +-
.gitlab-ci.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 29fc362..6472d2e 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get install -y openjdk-11-jdk-headless
# build and run tests
CMD mkdir build && \
cd build && \
- cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb/ .. && \
+ cmake .. && \
cmake --build . && \
/wait-for-it.sh caosdb-server:10443 -t 500 -- \
ctest
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d2a62d..b67a002 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,7 +130,7 @@ build-test:
- echo $PWD
- mkdir build
- cd build
- - cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb/ ..
+ - cmake ..
- cmake --build .
--
GitLab