From 566b43b85b52e873fa909722e365b35d7982ebaa Mon Sep 17 00:00:00 2001 From: Gwilym Kuiper Date: Tue, 2 Aug 2022 22:55:24 +0100 Subject: [PATCH 1/2] Check linker script consistency using just ci --- .github/workflows/linker-script.yml | 14 -------------- justfile | 6 +++++- 2 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 .github/workflows/linker-script.yml diff --git a/.github/workflows/linker-script.yml b/.github/workflows/linker-script.yml deleted file mode 100644 index 8699a31e..00000000 --- a/.github/workflows/linker-script.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Enforce gba.ld consistency - -on: [push, pull_request] - -jobs: - build: - runs-on: ubuntu-20.04 - steps: - - name: Check out repository - uses: actions/checkout@v3 - - name: Check if gba.ld files are identical - run: find -type f -name gba.ld -print0 | xargs -0 -n1 cmp -- agb/gba.ld - - name: Check if gba_mb.ld files are identical - run: find -type f -name gba_mb.ld -print0 | xargs -0 -n1 cmp -- agb/gba_mb.ld diff --git a/justfile b/justfile index 624be3c2..baaa31ef 100644 --- a/justfile +++ b/justfile @@ -39,7 +39,11 @@ run-game game: run-game-debug game: (cd "examples/{{game}}" && cargo run) -ci: build-debug clippy test build-release test-release doctest-agb build-roms build-book +check-linker-script-consistency: + find -type f -name gba.ld -print0 | xargs -0 -n1 cmp -- agb/gba.ld + find -type f -name gba_mb.ld -print0 | xargs -0 -n1 cmp -- agb/gba_mb.ld + +ci: check-linker-script-consistency build-debug clippy test build-release test-release doctest-agb build-roms build-book build-roms: just _build-rom "examples/the-purple-night" "PURPLENIGHT" From 1400dd16523a21f288ee43dd6aac8e63084cf669 Mon Sep 17 00:00:00 2001 From: Gwilym Kuiper Date: Tue, 2 Aug 2022 23:04:25 +0100 Subject: [PATCH 2/2] Name the build-and-test --- .github/workflows/build-and-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5eb9c298..ce3dae79 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,6 +11,7 @@ env: jobs: build: + name: Just CI runs-on: ubuntu-20.04 steps: - name: Install build tools