From 82cf2bf16a620a23849c0e73fdb27427a61b6a85 Mon Sep 17 00:00:00 2001 From: Jorropo Date: Fri, 26 Dec 2025 23:26:48 +0100 Subject: [PATCH 1/2] action: skip trying to comment binary size change results if it is not a PR (#9033) * action: skip trying to comment binary size change results if it is not a PR * action: fix halucinations in the clanker's code * action: cleanup one line --------- Co-authored-by: Ben Meadors Co-authored-by: Austin --- .github/workflows/main_matrix.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml index 8a25829e4..7280f9df4 100644 --- a/.github/workflows/main_matrix.yml +++ b/.github/workflows/main_matrix.yml @@ -240,6 +240,7 @@ jobs: needs: [build] steps: - uses: actions/checkout@v6 + if: github.event_name == 'pull_request_target' with: filter: blob:none # means we download all the git history but none of the commit (except ones with checkout like the head) fetch-depth: 0 @@ -253,18 +254,20 @@ jobs: uses: actions/upload-artifact@v6 id: upload-manifest with: - name: manifests-all + name: manifests-${{ github.sha }} overwrite: true - path: | - manifests-new/*.mt.json + path: manifests-new/*.mt.json - name: Find the merge base + if: github.event_name == 'pull_request_target' run: echo "MERGE_BASE=$(git merge-base "origin/$base" "$head")" >> $GITHUB_ENV env: base: ${{ github.base_ref }} - head: ${{ github.head_ref }} + head: ${{ github.sha }} - name: Download the old manifests - run: gh run download -R ${{ github.repository }} --commit ${{ env.MERGE_BASE }} --name manifests-all --dir manifest-old/ + if: github.event_name == 'pull_request_target' + run: gh run download -R ${{ github.repository }} --name manifests-${{ env.MERGE_BASE }} --dir manifest-old/ - name: Do scan and post comment + if: github.event_name == 'pull_request_target' run: python3 bin/shame.py ${{ github.event.pull_request.number }} manifests-old/ manifests-new/ release-artifacts: From 29c5713a7e72e48e9c6994bfce9f4bd08832d758 Mon Sep 17 00:00:00 2001 From: Austin Date: Fri, 26 Dec 2025 18:04:43 -0500 Subject: [PATCH 2/2] Correctly set type for event_mode max() position threshold (#9083) Fixes EVENT_MODE firmware builds --- src/modules/PositionModule.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/PositionModule.h b/src/modules/PositionModule.h index 4a2415058..32e499531 100644 --- a/src/modules/PositionModule.h +++ b/src/modules/PositionModule.h @@ -69,7 +69,7 @@ class PositionModule : public ProtobufModule, private concu // In event mode we want to prevent excessive position broadcasts // we set the minimum interval to 5m const uint32_t minimumTimeThreshold = - max(300000, Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30)); + max(uint32_t(300000), Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30)); #else const uint32_t minimumTimeThreshold = Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30);