Browse Source

Big restructure for crate and actions

Move the runner-specific docker stuff into that action directory, and
move the runner crate into a subdirectory for simpler top-level
structure.
pull/8/head
Ian Chamberlain 1 year ago
parent
commit
057496e4a2
No known key found for this signature in database
GPG Key ID: AE5484D09405AA60
  1. 2
      .github/workflows/ci.yml
  2. 0
      run-tests/.dockerignore
  3. 0
      run-tests/Dockerfile
  4. 7
      run-tests/action.yml
  5. 0
      run-tests/docker/download_citra.sh
  6. 0
      run-tests/docker/entrypoint.sh
  7. 0
      run-tests/docker/sdl2-config.ini
  8. 0
      run-tests/docker/test-runner.gdb
  9. 7
      test-runner/Cargo.toml
  10. 0
      test-runner/src/console.rs
  11. 0
      test-runner/src/gdb.rs
  12. 0
      test-runner/src/lib.rs
  13. 0
      test-runner/src/socket.rs
  14. 0
      test-runner/tests/integration.rs

2
.github/workflows/ci.yml

@ -60,6 +60,7 @@ jobs:
- name: Build and run tests (unit + integration) - name: Build and run tests (unit + integration)
uses: ./run-tests uses: ./run-tests
with: with:
working-directory: test-runner
args: -- -v args: -- -v
- name: Build and run doc tests - name: Build and run doc tests
@ -71,6 +72,7 @@ jobs:
RUSTDOCFLAGS: " --persist-doctests target/armv6k-nintendo-3ds/debug/doctests" RUSTDOCFLAGS: " --persist-doctests target/armv6k-nintendo-3ds/debug/doctests"
uses: ./run-tests uses: ./run-tests
with: with:
working-directory: test-runner
# TODO(#4): run them suckers # TODO(#4): run them suckers
args: --doc --no-run -- -v args: --doc --no-run -- -v

0
.dockerignore → run-tests/.dockerignore

0
Dockerfile → run-tests/Dockerfile

7
run-tests/action.yml

@ -16,6 +16,11 @@ inputs:
required: false required: false
default: test-runner-3ds default: test-runner-3ds
working-directory:
description: Change to this directory before running tests. Defaults to $GITHUB_WORKSPACE
required: false
default: ${GITHUB_WORKSPACE}
runs: runs:
using: composite using: composite
steps: steps:
@ -25,6 +30,7 @@ runs:
- name: Build test-runner image - name: Build test-runner image
uses: docker/build-push-action@v4 uses: docker/build-push-action@v4
with: with:
contest: ${{ github.action_path }}
tags: ${{ inputs.runner-image }}:latest tags: ${{ inputs.runner-image }}:latest
push: false push: false
load: true load: true
@ -40,6 +46,7 @@ runs:
# https://github.com/actions/runner/issues/2058, which also means # https://github.com/actions/runner/issues/2058, which also means
# we have to export this instead of using the env: key # we have to export this instead of using the env: key
run: | run: |
cd ${{ inputs.working-directory }}
export CARGO_TARGET_ARMV6K_NINTENDO_3DS_RUNNER=" export CARGO_TARGET_ARMV6K_NINTENDO_3DS_RUNNER="
docker run --rm docker run --rm
-v /tmp:/tmp -v /tmp:/tmp

0
docker/download_citra.sh → run-tests/docker/download_citra.sh

0
docker/entrypoint.sh → run-tests/docker/entrypoint.sh

0
docker/sdl2-config.ini → run-tests/docker/sdl2-config.ini

0
docker/test-runner.gdb → run-tests/docker/test-runner.gdb

7
Cargo.toml → test-runner/Cargo.toml

@ -12,3 +12,10 @@ socket = []
ctru-rs = { git = "https://github.com/rust3ds/ctru-rs" } ctru-rs = { git = "https://github.com/rust3ds/ctru-rs" }
ctru-sys = { git = "https://github.com/rust3ds/ctru-rs" } ctru-sys = { git = "https://github.com/rust3ds/ctru-rs" }
libc = "0.2.147" libc = "0.2.147"
[patch."https://github.com/ian-h-chamberlain/test-runner-3ds"]
test-runner = { path = "." }
# Future-proofing for a rename + org move:
[patch."https://github.com/rust3ds/test-runner"]
test-runner = { path = "." }

0
src/console.rs → test-runner/src/console.rs

0
src/gdb.rs → test-runner/src/gdb.rs

0
src/lib.rs → test-runner/src/lib.rs

0
src/socket.rs → test-runner/src/socket.rs

0
tests/integration.rs → test-runner/tests/integration.rs

Loading…
Cancel
Save