Skip to content
Snippets Groups Projects
Commit 2be4e662 authored by Joscha Schmiedt's avatar Joscha Schmiedt
Browse files

PIPELINE: Fix conan installation (use make conan)

parent be891fd2
No related branches found
No related tags found
2 merge requests!41Release 0.3.0,!35Adapt for Conan 2
Pipeline #53526 failed
Stage: info
Stage: setup
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
.docker/Dockerfile
+ 1
− 1
View file @ 2be4e662
...@@ -6,7 +6,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh ...@@ -6,7 +6,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
# build and install caosdb-cpplib # build and install caosdb-cpplib
WORKDIR /libcaosdb/ WORKDIR /libcaosdb/
RUN conan profile detect -f RUN conan profile detect -f
RUN conan create -s "compiler.libcxx=libstdc++11" -o caosdb/*:build_acm=True . RUN make conan
COPY . /caosdb-cppinttest COPY . /caosdb-cppinttest
WORKDIR /caosdb-cppinttest WORKDIR /caosdb-cppinttest
......
.gitignore
+ 0
− 1
View file @ 2be4e662
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
build/ build/
include/libcaosdbConfig.h include/libcaosdbConfig.h
cert/ cert/
.*
# CMake # CMake
CMakeLists.txt.user CMakeLists.txt.user
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment