From 2b7b51a9978b3d5376fc3f0b361ca29b161d977e Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 18 May 2021 21:06:37 +0200
Subject: [PATCH] WIP: pipeline
---
.gitlab-ci.yml | 4 ++--
test/.docker/Dockerfile | 2 +-
test/CMakeLists.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 67c1280..7ecb537 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,9 +34,9 @@ build-testenv:
tags: [ cached-dind ]
image: docker:20.10
stage: setup
- only:
- - web
script:
+ - whereis libcmocka
+ - whereis cmocka
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
# use here general latest or specific branch latest...
- docker pull $CI_REGISTRY_IMAGE|| true
diff --git a/test/.docker/Dockerfile b/test/.docker/Dockerfile
index 7af10e7..ab98426 100644
--- a/test/.docker/Dockerfile
+++ b/test/.docker/Dockerfile
@@ -1,6 +1,6 @@
FROM debian:latest
RUN apt-get update && \
apt-get install -y cmake
-RUN apt-get install -y libcmocka0
+RUN apt-get install -y libcmocka-dev
COPY ./ caosdb-clib/
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1f2e958..1ac6166 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,7 +3,7 @@ set(test_cases
test_connection
)
-find_library(cmocka-static libcmocka)
+find_library(cmocka-static cmocka)
if (cmocka-static)
message(STATUS "Found pre-installed cmocka: ${cmocka-static}")
elseif (${CMAKE_VERSION} VERSION_LESS "3.14.0")
--
GitLab