Skip to content

Commit fae5727

Browse files
Upgrade ubuntu, citra, and use Vulkan renderer
1 parent 49f06ea commit fae5727

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

run-tests/Dockerfile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ COPY ./docker/download_citra.sh /usr/local/bin/download_citra
55
RUN apt-get update -y && apt-get install -y jq
66

77
ARG CITRA_CHANNEL=nightly
8-
ARG CITRA_RELEASE=1995
8+
ARG CITRA_RELEASE=2098
99
RUN download_citra ${CITRA_CHANNEL} ${CITRA_RELEASE}
1010

1111
FROM devkitpro/devkitarm:latest as devkitarm
@@ -17,15 +17,18 @@ RUN cd /opt/devkitpro/examples/3ds/graphics/printing/hello-world && \
1717
make && \
1818
mv hello-world.3dsx /tmp/
1919

20-
FROM ubuntu:latest
20+
FROM ubuntu:mantic
2121

2222
RUN --mount=type=cache,sharing=locked,target=/var/cache/apt \
2323
apt-get update -y && \
2424
apt-get install -y \
25-
libswscale5 \
25+
libavfilter9 \
26+
libavformat60 \
27+
libavutil58 \
2628
libsdl2-2.0-0 \
27-
libavformat58 \
28-
libavfilter7 \
29+
libswscale7 \
30+
mesa-vulkan-drivers \
31+
vulkan-tools \
2932
xvfb
3033

3134
COPY --from=devkitarm /opt/devkitpro /opt/devkitpro

run-tests/docker/sdl2-config.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# OpenGL renderer seems to crash so we force using vulkan:
2+
# https://github.com/rust3ds/test-runner/issues/16
3+
[Renderer]
4+
graphics_api = 2
5+
16
[Miscellaneous]
27
log_filter = *:Info Debug.Emulated:Debug
38

0 commit comments

Comments
 (0)