Skip to content

Commit

Permalink
Merge pull request #19 from rust3ds/fix/citra-fork
Browse files Browse the repository at this point in the history
  • Loading branch information
ian-h-chamberlain authored Apr 20, 2024
2 parents b17065d + d8d7567 commit 162f060
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
5 changes: 2 additions & 3 deletions run-tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ WORKDIR /tmp
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=2098
RUN download_citra ${CITRA_CHANNEL} ${CITRA_RELEASE}
ARG TAG=r0c2f076
RUN download_citra ${TAG}

FROM devkitpro/devkitarm:latest as devkitarm

Expand Down
7 changes: 2 additions & 5 deletions run-tests/docker/download_citra.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

set -euxo pipefail

CITRA_CHANNEL=$1
CITRA_RELEASE=$2
TAG=$1

RELEASE_API="https://api.github.com/repos/citra-emu/citra-${CITRA_CHANNEL}/releases/tags/${CITRA_CHANNEL}-${CITRA_RELEASE}"

curl "${RELEASE_API}" |
curl "https://api.github.com/repos/PabloMK7/citra/releases/tags/${TAG}" |
jq --raw-output '.assets[].browser_download_url' |
grep -E 'citra-linux-.*[.]tar.gz' |
xargs wget -O citra-linux.tar.gz
Expand Down

0 comments on commit 162f060

Please sign in to comment.