Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade ubuntu, citra, and use Vulkan renderer #17

Merged
merged 2 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
toolchain:
- nightly-2023-06-01
- nightly-2024-02-18

runs-on: ubuntu-latest
container: devkitpro/devkitarm
Expand All @@ -39,7 +39,7 @@ jobs:
matrix:
toolchain:
# Oldest supported nightly
- nightly-2023-06-01
- nightly-2024-02-18
- nightly

continue-on-error: ${{ matrix.toolchain == 'nightly' }}
Expand Down
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
Loading