Skip to content
Snippets Groups Projects
Verified Commit d8f1c30e authored by Timm Fitschen's avatar Timm Fitschen
Browse files

WIP: conan

parent 99ebd385
No related branches found
No related tags found
No related merge requests found
Pipeline #9869 failed
...@@ -7,7 +7,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh ...@@ -7,7 +7,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
WORKDIR /libcaosdb/ WORKDIR /libcaosdb/
RUN mkdir build RUN mkdir build
WORKDIR /libcaosdb/build WORKDIR /libcaosdb/build
RUN conan create .. --profile ../conan.profile RUN conan create .. -s "compiler.libcxx=libstdc++11"
COPY . /caosdb-cppinttest COPY . /caosdb-cppinttest
WORKDIR /caosdb-cppinttest WORKDIR /caosdb-cppinttest
...@@ -16,7 +16,7 @@ RUN rm -rf .git ...@@ -16,7 +16,7 @@ RUN rm -rf .git
# build and run tests # build and run tests
CMD mkdir build && \ CMD mkdir build && \
cd build && \ cd build && \
conan install .. --profile /libcaosdb/conan.profile && \ conan install .. -s "compiler.libcxx=libstdc++11" && \
cmake .. && \ cmake .. && \
cmake --build . && \ cmake --build . && \
/wait-for-it.sh caosdb-server:10443 -t 500 -- \ /wait-for-it.sh caosdb-server:10443 -t 500 -- \
......
...@@ -97,7 +97,7 @@ build-test: ...@@ -97,7 +97,7 @@ build-test:
- echo $PWD - echo $PWD
- mkdir build - mkdir build
- cd build - cd build
- conan install .. --profile /libcaosdb/conan.profile - conan install .. -s "compiler.libcxx=libstdc++11"
- cmake .. - cmake ..
- cmake --build . - cmake --build .
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment