Browse Source

Upgrade ubuntu, citra, and use Vulkan renderer

pull/17/head
Ian Chamberlain 10 months ago
parent
commit
fae5727dea
No known key found for this signature in database
GPG Key ID: AE5484D09405AA60
  1. 13
      run-tests/Dockerfile
  2. 5
      run-tests/docker/sdl2-config.ini

13
run-tests/Dockerfile

@ -5,7 +5,7 @@ COPY ./docker/download_citra.sh /usr/local/bin/download_citra @@ -5,7 +5,7 @@ COPY ./docker/download_citra.sh /usr/local/bin/download_citra
RUN apt-get update -y && apt-get install -y jq
ARG CITRA_CHANNEL=nightly
ARG CITRA_RELEASE=1995
ARG CITRA_RELEASE=2098
RUN download_citra ${CITRA_CHANNEL} ${CITRA_RELEASE}
FROM devkitpro/devkitarm:latest as devkitarm
@ -17,15 +17,18 @@ RUN cd /opt/devkitpro/examples/3ds/graphics/printing/hello-world && \ @@ -17,15 +17,18 @@ RUN cd /opt/devkitpro/examples/3ds/graphics/printing/hello-world && \
make && \
mv hello-world.3dsx /tmp/
FROM ubuntu:latest
FROM ubuntu:mantic
RUN --mount=type=cache,sharing=locked,target=/var/cache/apt \
apt-get update -y && \
apt-get install -y \
libswscale5 \
libavfilter9 \
libavformat60 \
libavutil58 \
libsdl2-2.0-0 \
libavformat58 \
libavfilter7 \
libswscale7 \
mesa-vulkan-drivers \
vulkan-tools \
xvfb
COPY --from=devkitarm /opt/devkitpro /opt/devkitpro

5
run-tests/docker/sdl2-config.ini

@ -1,3 +1,8 @@ @@ -1,3 +1,8 @@
# OpenGL renderer seems to crash so we force using vulkan:
# https://github.com/rust3ds/test-runner/issues/16
[Renderer]
graphics_api = 2
[Miscellaneous]
log_filter = *:Info Debug.Emulated:Debug

Loading…
Cancel
Save