Skip to content

Commit 1d4134c

Browse files
thebenternthebentern
authored
Merge branch 'develop' into stm32-dynamic-queues
2 parents d240343 + f2a63fa commit 1d4134c

File tree

191 files changed

+2566
-1612
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+2566
-1612
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue
22
# trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions
33
# trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
4-
FROM mcr.microsoft.com/devcontainers/cpp:1-debian-12
4+
FROM mcr.microsoft.com/devcontainers/cpp:2-debian-12
55

66
USER root
77

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"features": {
99
"ghcr.io/devcontainers/features/python:1": {
1010
"installTools": true,
11-
"version": "latest"
11+
"version": "3.13"
1212
}
1313
},
1414
"customizations": {

‎.github/workflows/build_one_arch.yml‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -88,62 +88,6 @@ jobs:
8888
if: ${{ !contains(github.ref_name, 'event/') && github.event_name != 'workflow_dispatch' || !contains(github.ref_name, 'event/') && inputs.arch == 'native' }}
8989
uses: ./.github/workflows/test_native.yml
9090

91-
docker-deb-amd64:
92-
if: ${{ github.event_name != 'workflow_dispatch' || inputs.arch == 'native' }}
93-
uses: ./.github/workflows/docker_build.yml
94-
with:
95-
distro: debian
96-
platform: linux/amd64
97-
runs-on: ubuntu-24.04
98-
push: false
99-
100-
docker-deb-amd64-tft:
101-
if: ${{ github.event_name != 'workflow_dispatch' || inputs.arch == 'native' }}
102-
uses: ./.github/workflows/docker_build.yml
103-
with:
104-
distro: debian
105-
platform: linux/amd64
106-
runs-on: ubuntu-24.04
107-
push: false
108-
pio_env: native-tft
109-
110-
docker-alp-amd64:
111-
if: ${{ github.event_name != 'workflow_dispatch' || inputs.arch == 'native' }}
112-
uses: ./.github/workflows/docker_build.yml
113-
with:
114-
distro: alpine
115-
platform: linux/amd64
116-
runs-on: ubuntu-24.04
117-
push: false
118-
119-
docker-alp-amd64-tft:
120-
if: ${{ github.event_name != 'workflow_dispatch' || inputs.arch == 'native' }}
121-
uses: ./.github/workflows/docker_build.yml
122-
with:
123-
distro: alpine
124-
platform: linux/amd64
125-
runs-on: ubuntu-24.04
126-
push: false
127-
pio_env: native-tft
128-
129-
docker-deb-arm64:
130-
if: ${{ github.event_name != 'workflow_dispatch' || inputs.arch == 'native' }}
131-
uses: ./.github/workflows/docker_build.yml
132-
with:
133-
distro: debian
134-
platform: linux/arm64
135-
runs-on: ubuntu-24.04-arm
136-
push: false
137-
138-
docker-deb-armv7:
139-
if: ${{ github.event_name != 'workflow_dispatch' || inputs.arch == 'native' }}
140-
uses: ./.github/workflows/docker_build.yml
141-
with:
142-
distro: debian
143-
platform: linux/arm/v7
144-
runs-on: ubuntu-24.04-arm
145-
push: false
146-
14791
gather-artifacts:
14892
permissions:
14993
contents: write

‎.github/workflows/build_one_target.yml‎

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -106,62 +106,6 @@ jobs:
106106
if: ${{ !contains(github.ref_name, 'event/') && github.event_name != 'workflow_dispatch' || !contains(github.ref_name, 'event/') && inputs.arch == 'native' && inputs.target != '' }}
107107
uses: ./.github/workflows/test_native.yml
108108

109-
docker-deb-amd64:
110-
if: ${{ inputs.target != '' && inputs.arch == 'native' }}
111-
uses: ./.github/workflows/docker_build.yml
112-
with:
113-
distro: debian
114-
platform: linux/amd64
115-
runs-on: ubuntu-24.04
116-
push: false
117-
118-
docker-deb-amd64-tft:
119-
if: ${{ inputs.target != '' && inputs.arch == 'native' }}
120-
uses: ./.github/workflows/docker_build.yml
121-
with:
122-
distro: debian
123-
platform: linux/amd64
124-
runs-on: ubuntu-24.04
125-
push: false
126-
pio_env: native-tft
127-
128-
docker-alp-amd64:
129-
if: ${{ inputs.target != '' && inputs.arch == 'native' }}
130-
uses: ./.github/workflows/docker_build.yml
131-
with:
132-
distro: alpine
133-
platform: linux/amd64
134-
runs-on: ubuntu-24.04
135-
push: false
136-
137-
docker-alp-amd64-tft:
138-
if: ${{ inputs.target != '' && inputs.arch == 'native' }}
139-
uses: ./.github/workflows/docker_build.yml
140-
with:
141-
distro: alpine
142-
platform: linux/amd64
143-
runs-on: ubuntu-24.04
144-
push: false
145-
pio_env: native-tft
146-
147-
docker-deb-arm64:
148-
if: ${{ inputs.target != '' && inputs.arch == 'native' }}
149-
uses: ./.github/workflows/docker_build.yml
150-
with:
151-
distro: debian
152-
platform: linux/arm64
153-
runs-on: ubuntu-24.04-arm
154-
push: false
155-
156-
docker-deb-armv7:
157-
if: ${{ inputs.target != '' && inputs.arch == 'native' }}
158-
uses: ./.github/workflows/docker_build.yml
159-
with:
160-
distro: debian
161-
platform: linux/arm/v7
162-
runs-on: ubuntu-24.04-arm
163-
push: false
164-
165109
gather-artifacts:
166110
permissions:
167111
contents: write

‎.github/workflows/main_matrix.yml‎

Lines changed: 18 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -119,60 +119,26 @@ jobs:
119119
if: ${{ !contains(github.ref_name, 'event/') && github.repository == 'meshtastic/firmware' }}
120120
uses: ./.github/workflows/test_native.yml
121121

122-
docker-deb-amd64:
123-
if: github.repository == 'meshtastic/firmware'
124-
uses: ./.github/workflows/docker_build.yml
125-
with:
126-
distro: debian
127-
platform: linux/amd64
128-
runs-on: ubuntu-24.04
129-
push: false
130-
131-
docker-deb-amd64-tft:
132-
if: github.repository == 'meshtastic/firmware'
133-
uses: ./.github/workflows/docker_build.yml
134-
with:
135-
distro: debian
136-
platform: linux/amd64
137-
runs-on: ubuntu-24.04
138-
push: false
139-
pio_env: native-tft
140-
141-
docker-alp-amd64:
142-
if: github.repository == 'meshtastic/firmware'
143-
uses: ./.github/workflows/docker_build.yml
144-
with:
145-
distro: alpine
146-
platform: linux/amd64
147-
runs-on: ubuntu-24.04
148-
push: false
149-
150-
docker-alp-amd64-tft:
151-
if: github.repository == 'meshtastic/firmware'
152-
uses: ./.github/workflows/docker_build.yml
153-
with:
154-
distro: alpine
155-
platform: linux/amd64
156-
runs-on: ubuntu-24.04
157-
push: false
158-
pio_env: native-tft
159-
160-
docker-deb-arm64:
161-
if: github.repository == 'meshtastic/firmware'
162-
uses: ./.github/workflows/docker_build.yml
163-
with:
164-
distro: debian
165-
platform: linux/arm64
166-
runs-on: ubuntu-24.04-arm
167-
push: false
168-
169-
docker-deb-armv7:
170-
if: github.repository == 'meshtastic/firmware'
122+
docker:
123+
strategy:
124+
fail-fast: false
125+
matrix:
126+
distro: [debian, alpine]
127+
platform: [linux/amd64, linux/arm64, linux/arm/v7]
128+
pio_env: [native, native-tft]
129+
exclude:
130+
- distro: alpine
131+
platform: linux/arm/v7
132+
- pio_env: native-tft
133+
platform: linux/arm64
134+
- pio_env: native-tft
135+
platform: linux/arm/v7
171136
uses: ./.github/workflows/docker_build.yml
172137
with:
173-
distro: debian
174-
platform: linux/arm/v7
175-
runs-on: ubuntu-24.04-arm
138+
distro: ${{ matrix.distro }}
139+
platform: ${{ matrix.platform }}
140+
runs-on: ${{ contains(matrix.platform, 'arm') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
141+
pio_env: ${{ matrix.pio_env }}
176142
push: false
177143

178144
gather-artifacts:

‎.github/workflows/merge_queue.yml‎

Lines changed: 18 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -99,54 +99,26 @@ jobs:
9999
if: ${{ !contains(github.ref_name, 'event/') }}
100100
uses: ./.github/workflows/test_native.yml
101101

102-
docker-deb-amd64:
103-
uses: ./.github/workflows/docker_build.yml
104-
with:
105-
distro: debian
106-
platform: linux/amd64
107-
runs-on: ubuntu-24.04
108-
push: false
109-
110-
docker-deb-amd64-tft:
111-
uses: ./.github/workflows/docker_build.yml
112-
with:
113-
distro: debian
114-
platform: linux/amd64
115-
runs-on: ubuntu-24.04
116-
push: false
117-
pio_env: native-tft
118-
119-
docker-alp-amd64:
120-
uses: ./.github/workflows/docker_build.yml
121-
with:
122-
distro: alpine
123-
platform: linux/amd64
124-
runs-on: ubuntu-24.04
125-
push: false
126-
127-
docker-alp-amd64-tft:
128-
uses: ./.github/workflows/docker_build.yml
129-
with:
130-
distro: alpine
131-
platform: linux/amd64
132-
runs-on: ubuntu-24.04
133-
push: false
134-
pio_env: native-tft
135-
136-
docker-deb-arm64:
137-
uses: ./.github/workflows/docker_build.yml
138-
with:
139-
distro: debian
140-
platform: linux/arm64
141-
runs-on: ubuntu-24.04-arm
142-
push: false
143-
144-
docker-deb-armv7:
102+
docker:
103+
strategy:
104+
fail-fast: false
105+
matrix:
106+
distro: [debian, alpine]
107+
platform: [linux/amd64, linux/arm64, linux/arm/v7]
108+
pio_env: [native, native-tft]
109+
exclude:
110+
- distro: alpine
111+
platform: linux/arm/v7
112+
- pio_env: native-tft
113+
platform: linux/arm64
114+
- pio_env: native-tft
115+
platform: linux/arm/v7
145116
uses: ./.github/workflows/docker_build.yml
146117
with:
147-
distro: debian
148-
platform: linux/arm/v7
149-
runs-on: ubuntu-24.04-arm
118+
distro: ${{ matrix.distro }}
119+
platform: ${{ matrix.platform }}
120+
runs-on: ${{ contains(matrix.platform, 'arm') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
121+
pio_env: ${{ matrix.pio_env }}
150122
push: false
151123

152124
gather-artifacts:

‎.github/workflows/sec_sast_semgrep_cron.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
# step 4
4343
- name: publish code scanning alerts
44-
uses: github/codeql-action/upload-sarif@v3
44+
uses: github/codeql-action/upload-sarif@v4
4545
with:
4646
sarif_file: report.sarif
4747
category: semgrep

‎.github/workflows/stale_bot.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,7 @@ jobs:
2020
uses: actions/[email protected]
2121
with:
2222
days-before-stale: 45
23-
exempt-issue-labels: pinned,3.0
24-
exempt-pr-labels: pinned,3.0
23+
stale-issue-message: This issue has not had any comment or update in the last month. If it is still relevant, please post update comments. If no comments are made, this issue will be closed automagically in 7 days.
24+
close-issue-message: This issue has not had any comment since the last notice. It has been closed automatically. If this is incorrect, or the issue becomes relevant again, please request that it is reopened.
25+
exempt-issue-labels: pinned,3.0,triaged,backlog
26+
exempt-pr-labels: pinned,3.0,triaged,backlog

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
pio upgrade
4848
4949
- name: Setup Node
50-
uses: actions/setup-node@v5
50+
uses: actions/setup-node@v6
5151
with:
5252
node-version: 22
5353

‎.trunk/trunk.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ cli:
44
plugins:
55
sources:
66
- id: trunk
7-
ref: v1.7.2
7+
ref: v1.7.3
88
uri: https://github.com/trunk-io/plugins
99
lint:
1010
enabled:
11-
- [email protected].473
12-
- renovate@41.132.5
11+
- [email protected].483
12+
- renovate@41.148.2
1313
- [email protected]
1414
- [email protected]
1515
- [email protected]
1616
- [email protected]
17-
- [email protected].0
17+
- [email protected].2
1818
- [email protected]
19-
- ruff@0.13.2
20-
- isort@6.1.0
19+
- ruff@0.14.0
20+
- isort@7.0.0
2121
- [email protected]
2222
- [email protected]
2323
- [email protected]
24-
- [email protected].7
24+
- [email protected].8
2525
- [email protected]
2626
- [email protected]
2727
- [email protected]

0 commit comments

Comments
 (0)