Merge branch 'master' into develop

This commit is contained in:
Ben Meadors
2025-09-18 19:18:53 -05:00
32 changed files with 1487 additions and 52 deletions

View File

@@ -3,7 +3,7 @@ concurrency:
group: ci-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
on:
# # Triggers the workflow on push but only for the master branch
# # Triggers the workflow on push but only for the main branches
push:
branches:
- master
@@ -271,6 +271,7 @@ jobs:
gather-artifacts:
if: github.repository == 'meshtastic/firmware'
# trunk-ignore(checkov/CKV2_GHA_1)
permissions:
contents: write
pull-requests: write