From 3e874d4bcd38254bad2294bbc2e671a7dd73927b Mon Sep 17 00:00:00 2001 From: jonschz Date: Sun, 19 Jan 2025 10:54:03 +0100 Subject: [PATCH] Run experimental JSON diff, part 2 --- .github/workflows/build.yml | 15 +++++++-------- LEGO1/lego/legoomni/include/legorace.h | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2464d19f..8a5a4b80 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,10 +149,9 @@ jobs: curl -fLSs -o ISLEPROGRESS-old.json https://github.com/isledecomp/isle/releases/download/continuous/ISLEPROGRESS.json || echo "" >ISLEPROGRESS-old.json curl -fLSs -o LEGO1PROGRESS-old.json https://github.com/isledecomp/isle/releases/download/continuous/LEGO1PROGRESS.json || echo "" >LEGO1PROGRESS-old.json -# Disabled until one build has been created - will fail otherwise -# reccmp-reccmp --target CONFIG --diff CONFIGPROGRESS-old.json -# reccmp-reccmp --target ISLE --diff ISLEPROGRESS-old.json -# reccmp-reccmp --target LEGO1 --diff LEGO1PROGRESS-old.json + reccmp-reccmp --target CONFIG --diff CONFIGPROGRESS-old.json + reccmp-reccmp --target ISLE --diff ISLEPROGRESS-old.json + reccmp-reccmp --target LEGO1 --diff LEGO1PROGRESS-old.json - name: Test Exports shell: bash @@ -187,7 +186,7 @@ jobs: needs: [build, compare] runs-on: ubuntu-latest # FIXME: CHANGED TEMPORARILY FOR TESTING PURPOSES, CHANGE BACK -# if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'isledecomp/isle' }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'isledecomp/isle' }} steps: - uses: actions/checkout@v4 with: @@ -215,6 +214,6 @@ jobs: ISLEPROGRESS.* \ LEGO1PROGRESS.* -# curl -X POST -F key=$UPLOAD_KEY -F 'file=@CONFIGPROGRESS.SVG' https://legoisland.org/progress/ -# curl -X POST -F key=$UPLOAD_KEY -F 'file=@ISLEPROGRESS.SVG' https://legoisland.org/progress/ -# curl -X POST -F key=$UPLOAD_KEY -F 'file=@LEGO1PROGRESS.SVG' https://legoisland.org/progress/ + curl -X POST -F key=$UPLOAD_KEY -F 'file=@CONFIGPROGRESS.SVG' https://legoisland.org/progress/ + curl -X POST -F key=$UPLOAD_KEY -F 'file=@ISLEPROGRESS.SVG' https://legoisland.org/progress/ + curl -X POST -F key=$UPLOAD_KEY -F 'file=@LEGO1PROGRESS.SVG' https://legoisland.org/progress/ diff --git a/LEGO1/lego/legoomni/include/legorace.h b/LEGO1/lego/legoomni/include/legorace.h index 344136f3..130a3f90 100644 --- a/LEGO1/lego/legoomni/include/legorace.h +++ b/LEGO1/lego/legoomni/include/legorace.h @@ -66,7 +66,7 @@ class RaceState : public LegoState { RaceState(); - // FUNCTION: LEGO1 0x10016010 + // // FUNCTION: LEGO1 0x10016010 // FUNCTION: BETA10 0x100a9040 const char* ClassName() const override // vtable+0x0c {