yuzu/build-environments
1
0
Fork 0
mirror of https://github.com/yuzu-emu/build-environments.git synced 2025-09-20 14:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make use of up to date libraries on the buildbots

Browse source 
Ensures that the docker containers use more up to date versions of the
libraries that we install from conan.
This commit is contained in:
Lioncash 2020-08-14 08:04:17 -04:00
parent 6e5efdd94a
commit 5e6759df8c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
linux-fresh/Dockerfile
View file

@ -28,6 +28,6 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
pip3 install conan && \ pip3 install conan && \
apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log
USER 1027 USER 1027
RUN conan install catch2/2.11.0@ -s compiler.libcxx=libstdc++11 --build=missing && \ RUN conan install catch2/2.13.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
conan install fmt/6.2.0@ -s compiler.libcxx=libstdc++11 --build=missing && \ conan install fmt/7.0.3@ -s compiler.libcxx=libstdc++11 --build=missing && \
conan install nlohmann_json/3.7.3@ -s compiler.libcxx=libstdc++11 --build=missing conan install nlohmann_json/3.9.1@ -s compiler.libcxx=libstdc++11 --build=missing

6
linux-mingw/Dockerfile
View file

@ -50,6 +50,6 @@ RUN pip3 install conan
COPY --chown=yuzu:yuzu default /home/yuzu/.conan/profiles/ COPY --chown=yuzu:yuzu default /home/yuzu/.conan/profiles/
USER 1027 USER 1027
# Install/build the missing libs (uses the default mingw cross compile profile) # Install/build the missing libs (uses the default mingw cross compile profile)
RUN conan install catch2/2.11.0@ --build=missing && \ RUN conan install catch2/2.13.0@ --build=missing && \
conan install fmt/6.2.0@ --build=missing && \ conan install fmt/7.0.3@ --build=missing && \
conan install nlohmann_json/3.7.3@ --build=missing conan install nlohmann_json/3.9.1@ --build=missing