From 5af562c6be6476f84ebe5bef7bd7b85685156d41 Mon Sep 17 00:00:00 2001 From: cj-vana Date: Sat, 16 May 2026 13:05:24 -0600 Subject: [PATCH] ci: pin submodule to upstream base and apply patches at build time MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The submodule had been pointing at a local MeshCore commit that included all 5 patches applied on top of upstream. That commit only exists in the local working tree — CI's `submodules: recursive` checkout couldn't fetch it from github.com/meshcore-dev/MeshCore and failed with "fatal: not our ref d2ad3ac8". Resets vendor/MeshCore to upstream main (910b1bee, the same base our patches were authored against) so CI can fetch it normally, and adds an explicit `apply-patches.sh` step to the firmware-build workflow before the verify and build steps run. The release workflow already applies patches explicitly so no change there. Subsequent verify/build steps set MESHCORE_SKIP_APPLY_PATCHES=1 to avoid re-applying patches on the now-dirty tree. --- .github/workflows/firmware-build.yml | 5 ++++- vendor/MeshCore | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/firmware-build.yml b/.github/workflows/firmware-build.yml index 5ef3168..b222d82 100644 --- a/.github/workflows/firmware-build.yml +++ b/.github/workflows/firmware-build.yml @@ -40,8 +40,11 @@ jobs: - name: Install PlatformIO run: python3 -m pip install --upgrade platformio + - name: Apply MeshCore patches + run: bash scripts/apply-patches.sh + - name: Run host tests and safety checks - run: bash scripts/verify.sh --no-build + run: MESHCORE_SKIP_APPLY_PATCHES=1 bash scripts/verify.sh --no-build - name: Build representative firmware run: | diff --git a/vendor/MeshCore b/vendor/MeshCore index d2ad3ac..910b1be 160000 --- a/vendor/MeshCore +++ b/vendor/MeshCore @@ -1 +1 @@ -Subproject commit d2ad3ac818e01c94997c51d587a7911cc6a8cfee +Subproject commit 910b1bee5b0ccffc472c7684d4165fc85c681896