From 986b47711e0e91f55695072bf3e3c809b37203b3 Mon Sep 17 00:00:00 2001 From: Ian Chamberlain Date: Sun, 24 Sep 2023 13:30:52 -0400 Subject: [PATCH] Minor docker cleanup --- run-tests/Dockerfile | 2 +- run-tests/docker/entrypoint.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/run-tests/Dockerfile b/run-tests/Dockerfile index c250038..aa95b1d 100644 --- a/run-tests/Dockerfile +++ b/run-tests/Dockerfile @@ -8,7 +8,7 @@ ARG CITRA_CHANNEL=nightly ARG CITRA_RELEASE=1995 RUN download_citra ${CITRA_CHANNEL} ${CITRA_RELEASE} -FROM devkitpro/devkitarm as devkitarm +FROM devkitpro/devkitarm:latest as devkitarm # For some reason, citra isn't always happy when you try to run it for the first time, # so we build a simple dummy program to force it to create its directory structure diff --git a/run-tests/docker/entrypoint.sh b/run-tests/docker/entrypoint.sh index e36af9f..3e2ecbf 100755 --- a/run-tests/docker/entrypoint.sh +++ b/run-tests/docker/entrypoint.sh @@ -1,6 +1,10 @@ #!/bin/bash -set -x +# Uncomment for debugging the action itself. Maybe consider a job summary or +# grouping the output, to keep this stuff visible but make it simpler to use: +# https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions + +# set -x function cleanup_jobs() { # shellcheck disable=SC2317 # Unreachable because it's only used in trap