From 5a8abccfcfeca27f88ccf2f0a7b94e175a7ded6c Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 30 Jun 2021 20:23:19 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 2 +-
.gitlab-ci.yml | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index bc8753d..aecabd5 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get install -y openjdk-11-jdk-headless
# build and run tests
CMD mkdir build && \
cd build && \
- cmake .. && \
+ cmake -D CMAKE_PREFIX_PATH=/usr/local/ .. && \
cmake --build . && \
/wait-for-it.sh caosdb-server:10443 -t 500 -- \
ctest
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 249dc3f..6dbfeca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,11 +126,12 @@ build-test:
image: $CPPINTTEST_REGISTRY_IMAGE
tags: [ docker ]
stage: build
+ needs: []
script:
- echo $PWD
- mkdir build
- cd build
- - cmake ..
+ - cmake -D CMAKE_PREFIX_PATH=/usr/local/ ..
- cmake --build .
@@ -216,6 +217,7 @@ test:
cert:
tags: [docker]
stage: build
+ needs: []
image: $CPPINTTEST_REGISTRY_IMAGE
artifacts:
paths:
--
GitLab