Skip to content
Snippets Groups Projects
Verified Commit 98a01c19 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

Merge branch 'f-debian-buster' into f-macos

parents 5b472e5b 4fa5f5ef
No related branches found
No related tags found
2 merge requests!6Draft: ENH: Adapt for MacOS,!5Final review
Pipeline #18208 failed
......@@ -7,8 +7,8 @@ RUN mkdir build
WORKDIR /libcaosdb/build
RUN conan create .. -s "compiler.libcxx=libstdc++11"
RUN apt-get install -y octave-common/buster-backports liboctave7/buster-backports octave/buster-backports
RUN apt-get install -y liboctave-dev/buster-backports
RUN apt-get install -y octave-common liboctave8 octave
RUN apt-get install -y liboctave-dev
RUN apt-get install -y unzip
RUN apt-get install -y wget
......
[requires]
caosdb/[>=0.1.0]
gtest/[=1.11.0]
[build_requires]
gtest/1.11.0
......
......@@ -4,7 +4,7 @@ bottle==0.12.19
certifi==2021.5.30
charset-normalizer==2.0.1
colorama==0.4.4
conan==1.38.0
conan==1.43.0
deprecation==2.0.7
distro==1.5.0
docutils==0.16
......@@ -38,4 +38,4 @@ sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
tqdm==4.61.2
urllib3==1.25.11
urllib3==1.26.6
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment