Skip to content

Commit

Permalink
Upgrade ubuntu, citra, and use Vulkan renderer
Browse files Browse the repository at this point in the history
  • Loading branch information
ian-h-chamberlain committed Feb 22, 2024
1 parent 49f06ea commit fae5727
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
13 changes: 8 additions & 5 deletions run-tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 5 additions & 0 deletions run-tests/docker/sdl2-config.ini
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit fae5727

Please sign in to comment.