From 6c62a56b1f96e535495a4da0f4f0d4cd572b4d4a Mon Sep 17 00:00:00 2001 From: Dalton-V Date: Thu, 10 Sep 2026 20:50:55 -0500 Subject: [PATCH 1/5] Attempt CI reductions --- .../workflows/cpp-ci-serial-programs-base.yml | 18 +++++++++--------- .../cpp-ci-serial-programs-mac-intel.yml | 1 + .../workflows/cpp-ci-serial-programs-mac.yml | 1 + .../cpp-ci-serial-programs-ubuntu-clang.yml | 1 + .../cpp-ci-serial-programs-ubuntu-default.yml | 1 + .../cpp-ci-serial-programs-windows-clang.yml | 1 + .../cpp-ci-serial-programs-windows-default.yml | 1 + 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cpp-ci-serial-programs-base.yml b/.github/workflows/cpp-ci-serial-programs-base.yml index aa515bb6a1..506189b1e3 100644 --- a/.github/workflows/cpp-ci-serial-programs-base.yml +++ b/.github/workflows/cpp-ci-serial-programs-base.yml @@ -49,16 +49,16 @@ jobs: - name: Checkout Arduino-Source uses: actions/checkout@v7 with: - path: 'Arduino-Source' - submodules: 'recursive' + path: "Arduino-Source" + submodules: "recursive" - name: Install Qt uses: jurplel/install-qt-action@v4 with: # Delete aqtsource once https://github.com/miurahr/aqtinstall/issues/1007 is fixed and released - aqtsource: 'git+https://github.com/miurahr/aqtinstall' - version: '6.10.2' - modules: 'qtmultimedia qtserialport' + aqtsource: "git+https://github.com/miurahr/aqtinstall" + version: "6.10.2" + modules: "qtmultimedia qtserialport" - name: Install dependencies (Ubuntu) if: startsWith(inputs.os, 'ubuntu') @@ -118,8 +118,8 @@ jobs: uses: actions/checkout@v7 if: inputs.run-tests with: - repository: 'PokemonAutomation/CommandLineTests' - path: 'CommandLineTests' + repository: "PokemonAutomation/CommandLineTests" + path: "CommandLineTests" - name: Run tests (Windows) if: startsWith(inputs.os, 'windows') && inputs.run-tests @@ -150,7 +150,7 @@ jobs: - name: Run clang query if: inputs.run-clang-query - run : | + run: | cd Arduino-Source cat << 'EOF' > query.txt @@ -181,4 +181,4 @@ jobs: name: Clang query output (compiler=${{inputs.compiler}}) path: | Arduino-Source/SerialPrograms/bin/compile_commands.json - Arduino-Source/clang-query-output.txt \ No newline at end of file + Arduino-Source/clang-query-output.txt diff --git a/.github/workflows/cpp-ci-serial-programs-mac-intel.yml b/.github/workflows/cpp-ci-serial-programs-mac-intel.yml index cdf8dc6dd7..eba6cf90cd 100644 --- a/.github/workflows/cpp-ci-serial-programs-mac-intel.yml +++ b/.github/workflows/cpp-ci-serial-programs-mac-intel.yml @@ -1,6 +1,7 @@ name: C++ CI Serial Programs Mac Intel on: push: + branches: [main] workflow_dispatch: pull_request: types: [opened, synchronize, reopened, ready_for_review] diff --git a/.github/workflows/cpp-ci-serial-programs-mac.yml b/.github/workflows/cpp-ci-serial-programs-mac.yml index 3a59c7d0ef..e97805b76e 100644 --- a/.github/workflows/cpp-ci-serial-programs-mac.yml +++ b/.github/workflows/cpp-ci-serial-programs-mac.yml @@ -1,6 +1,7 @@ name: C++ CI Serial Programs Mac on: push: + branches: [main] workflow_dispatch: pull_request: types: [opened, synchronize, reopened, ready_for_review] diff --git a/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml b/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml index 8e4abbb2f5..b05cd243cb 100644 --- a/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml +++ b/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml @@ -1,6 +1,7 @@ name: C++ CI Serial Programs Ubuntu clang on: push: + branches: [main] workflow_dispatch: pull_request: types: [opened, synchronize, reopened, ready_for_review] diff --git a/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml b/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml index b84887ef05..d9135a79c6 100644 --- a/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml +++ b/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml @@ -1,6 +1,7 @@ name: C++ CI Serial Programs Ubuntu Default on: push: + branches: [main] workflow_dispatch: pull_request: types: [opened, synchronize, reopened, ready_for_review] diff --git a/.github/workflows/cpp-ci-serial-programs-windows-clang.yml b/.github/workflows/cpp-ci-serial-programs-windows-clang.yml index b725cc4c98..beffaae695 100644 --- a/.github/workflows/cpp-ci-serial-programs-windows-clang.yml +++ b/.github/workflows/cpp-ci-serial-programs-windows-clang.yml @@ -1,6 +1,7 @@ name: C++ CI Serial Programs Windows Clang on: push: + branches: [main] workflow_dispatch: pull_request: types: [opened, synchronize, reopened, ready_for_review] diff --git a/.github/workflows/cpp-ci-serial-programs-windows-default.yml b/.github/workflows/cpp-ci-serial-programs-windows-default.yml index 35940e1c94..6ab2489835 100644 --- a/.github/workflows/cpp-ci-serial-programs-windows-default.yml +++ b/.github/workflows/cpp-ci-serial-programs-windows-default.yml @@ -1,6 +1,7 @@ name: C++ CI Serial Programs Windows Default on: push: + branches: [main] workflow_dispatch: pull_request: types: [opened, synchronize, reopened, ready_for_review] From 571b473cc17906b5400adae88313d6b58e4fb0c0 Mon Sep 17 00:00:00 2001 From: Dalton-V Date: Thu, 10 Sep 2026 21:13:25 -0500 Subject: [PATCH 2/5] Use concurrency in CI --- .github/workflows/cpp-ci-serial-programs-mac-intel.yml | 8 ++++++++ .github/workflows/cpp-ci-serial-programs-mac.yml | 8 ++++++++ .github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml | 8 ++++++++ .../workflows/cpp-ci-serial-programs-ubuntu-default.yml | 8 ++++++++ .../workflows/cpp-ci-serial-programs-windows-clang.yml | 8 ++++++++ .../workflows/cpp-ci-serial-programs-windows-default.yml | 8 ++++++++ 6 files changed, 48 insertions(+) diff --git a/.github/workflows/cpp-ci-serial-programs-mac-intel.yml b/.github/workflows/cpp-ci-serial-programs-mac-intel.yml index eba6cf90cd..19eff37f08 100644 --- a/.github/workflows/cpp-ci-serial-programs-mac-intel.yml +++ b/.github/workflows/cpp-ci-serial-programs-mac-intel.yml @@ -6,6 +6,14 @@ on: pull_request: types: [opened, synchronize, reopened, ready_for_review] +concurrency: + group: >- + ${{ github.workflow }}- + ${{ github.event.pull_request.stack.number || + github.event.pull_request.number || + github.run_id }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + jobs: build: if: github.event_name != 'pull_request' || github.event.pull_request.draft == false diff --git a/.github/workflows/cpp-ci-serial-programs-mac.yml b/.github/workflows/cpp-ci-serial-programs-mac.yml index e97805b76e..5201d80e72 100644 --- a/.github/workflows/cpp-ci-serial-programs-mac.yml +++ b/.github/workflows/cpp-ci-serial-programs-mac.yml @@ -6,6 +6,14 @@ on: pull_request: types: [opened, synchronize, reopened, ready_for_review] +concurrency: + group: >- + ${{ github.workflow }}- + ${{ github.event.pull_request.stack.number || + github.event.pull_request.number || + github.run_id }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + jobs: build: if: github.event_name != 'pull_request' || github.event.pull_request.draft == false diff --git a/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml b/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml index b05cd243cb..647b30ffb1 100644 --- a/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml +++ b/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml @@ -6,6 +6,14 @@ on: pull_request: types: [opened, synchronize, reopened, ready_for_review] +concurrency: + group: >- + ${{ github.workflow }}- + ${{ github.event.pull_request.stack.number || + github.event.pull_request.number || + github.run_id }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + jobs: build: if: github.event_name != 'pull_request' || github.event.pull_request.draft == false diff --git a/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml b/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml index d9135a79c6..67f893da52 100644 --- a/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml +++ b/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml @@ -6,6 +6,14 @@ on: pull_request: types: [opened, synchronize, reopened, ready_for_review] +concurrency: + group: >- + ${{ github.workflow }}- + ${{ github.event.pull_request.stack.number || + github.event.pull_request.number || + github.run_id }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + jobs: build: if: github.event_name != 'pull_request' || github.event.pull_request.draft == false diff --git a/.github/workflows/cpp-ci-serial-programs-windows-clang.yml b/.github/workflows/cpp-ci-serial-programs-windows-clang.yml index beffaae695..0fe396f0d3 100644 --- a/.github/workflows/cpp-ci-serial-programs-windows-clang.yml +++ b/.github/workflows/cpp-ci-serial-programs-windows-clang.yml @@ -6,6 +6,14 @@ on: pull_request: types: [opened, synchronize, reopened, ready_for_review] +concurrency: + group: >- + ${{ github.workflow }}- + ${{ github.event.pull_request.stack.number || + github.event.pull_request.number || + github.run_id }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + jobs: build: if: github.event_name != 'pull_request' || github.event.pull_request.draft == false diff --git a/.github/workflows/cpp-ci-serial-programs-windows-default.yml b/.github/workflows/cpp-ci-serial-programs-windows-default.yml index 6ab2489835..378f7954f1 100644 --- a/.github/workflows/cpp-ci-serial-programs-windows-default.yml +++ b/.github/workflows/cpp-ci-serial-programs-windows-default.yml @@ -6,6 +6,14 @@ on: pull_request: types: [opened, synchronize, reopened, ready_for_review] +concurrency: + group: >- + ${{ github.workflow }}- + ${{ github.event.pull_request.stack.number || + github.event.pull_request.number || + github.run_id }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + jobs: build: if: github.event_name != 'pull_request' || github.event.pull_request.draft == false From 1166193203fd715d02b077cadc422942941f6502 Mon Sep 17 00:00:00 2001 From: Dalton-V Date: Thu, 10 Sep 2026 20:55:21 -0500 Subject: [PATCH 3/5] removed comment --- .../Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp index 6203e1223f..859c337a4d 100644 --- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp +++ b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp @@ -19,7 +19,6 @@ moves stats level surname -language "stamps" */ From 7b1a86df89f323cc53da1f4fb238ed7bac56c1bd Mon Sep 17 00:00:00 2001 From: Dalton-V Date: Thu, 10 Sep 2026 21:06:13 -0500 Subject: [PATCH 4/5] Remove different comment --- .../Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp index 859c337a4d..7c03c8401a 100644 --- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp +++ b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp @@ -12,7 +12,6 @@ Add enum for ball ? Also, BDSP is reading from swsh data. Worth refactoring ? ideas for more checks : ability nature -type original game OT moves From cd3f6a7b85bc5cadac954c638031b1199ccf7ba9 Mon Sep 17 00:00:00 2001 From: Dalton-V Date: Thu, 10 Sep 2026 21:08:54 -0500 Subject: [PATCH 5/5] remove ability comment --- .../Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp index 7c03c8401a..f85550b270 100644 --- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp +++ b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorter.cpp @@ -10,7 +10,6 @@ Optimise the swapping algo Add enum for ball ? Also, BDSP is reading from swsh data. Worth refactoring ? ideas for more checks : -ability nature original game OT