Skip to content

Commit 030e724

Browse files
vidplace7vidplace7
committed
Meshtastic build manifest
1 parent 981d058 commit 030e724

37 files changed

+518
-428
lines changed

‎.clusterfuzzlite/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ for f in .clusterfuzzlite/*_fuzzer.cpp; do
5151
fuzzer=$(basename "$f" .cpp)
5252
cp -f "$f" src/fuzzer.cpp
5353
pio run -vvv --environment "$PIO_ENV"
54-
program="$PLATFORMIO_WORKSPACE_DIR/build/$PIO_ENV/program"
54+
program="$PLATFORMIO_WORKSPACE_DIR/build/$PIO_ENV/meshtasticd"
5555
cp "$program" "$OUT/$fuzzer"
5656

5757
# Copy shared libraries used by the fuzzer.

‎.github/actions/build-variant/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ runs:
102102
- name: Store binaries as an artifact
103103
uses: actions/upload-artifact@v4
104104
with:
105-
name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
105+
name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}
106106
overwrite: true
107107
path: |
108108
${{ inputs.artifact-paths }}

‎.github/workflows/build_firmware.yml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,29 @@ jobs:
5555
ota_firmware_source: ${{ steps.ota_dir.outputs.src || '' }}
5656
ota_firmware_target: ${{ steps.ota_dir.outputs.tgt || '' }}
5757

58+
- name: Echo manifest from release/firmware-*.mt.json to job summary
59+
if: ${{ always() }}
60+
env:
61+
PIO_ENV: ${{ inputs.pio_env }}
62+
run: |
63+
echo "## Manifest: \`$PIO_ENV\`" >> $GITHUB_STEP_SUMMARY
64+
echo '```json' >> $GITHUB_STEP_SUMMARY
65+
cat release/firmware-*.mt.json >> $GITHUB_STEP_SUMMARY
66+
echo '' >> $GITHUB_STEP_SUMMARY
67+
echo '```' >> $GITHUB_STEP_SUMMARY
68+
5869
- name: Store binaries as an artifact
5970
uses: actions/upload-artifact@v4
6071
id: upload
6172
with:
62-
name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}.zip
73+
name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}
6374
overwrite: true
6475
path: |
76+
release/*.mt.json
6577
release/*.bin
6678
release/*.elf
6779
release/*.uf2
6880
release/*.hex
69-
release/*-ota.zip
81+
release/*.zip
82+
release/device-*.sh
83+
release/device-*.bat

‎.github/workflows/build_one_arch.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
./firmware-*.bin
135135
./firmware-*.uf2
136136
./firmware-*.hex
137-
./firmware-*-ota.zip
137+
./firmware-*.zip
138138
./device-*.sh
139139
./device-*.bat
140140
./littlefs-*.bin
@@ -163,7 +163,7 @@ jobs:
163163
- name: Repackage in single elfs zip
164164
uses: actions/upload-artifact@v4
165165
with:
166-
name: debug-elfs-${{inputs.arch}}-${{ needs.version.outputs.long }}.zip
166+
name: debug-elfs-${{inputs.arch}}-${{ needs.version.outputs.long }}
167167
overwrite: true
168168
path: ./*.elf
169169
retention-days: 30

‎.github/workflows/build_one_target.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
./firmware-*.bin
141141
./firmware-*.uf2
142142
./firmware-*.hex
143-
./firmware-*-ota.zip
143+
./firmware-*.zip
144144
./device-*.sh
145145
./device-*.bat
146146
./littlefs-*.bin

‎.github/workflows/main_matrix.yml‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -177,19 +177,17 @@ jobs:
177177
- name: Display structure of downloaded files
178178
run: ls -R
179179

180-
- name: Move files up
181-
run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
182-
183180
- name: Repackage in single firmware zip
184181
uses: actions/upload-artifact@v4
185182
with:
186183
name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
187184
overwrite: true
188185
path: |
186+
./firmware-*.mt.json
189187
./firmware-*.bin
190188
./firmware-*.uf2
191189
./firmware-*.hex
192-
./firmware-*-ota.zip
190+
./firmware-*.zip
193191
./device-*.sh
194192
./device-*.bat
195193
./littlefs-*.bin
@@ -218,7 +216,7 @@ jobs:
218216
- name: Repackage in single elfs zip
219217
uses: actions/upload-artifact@v4
220218
with:
221-
name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
219+
name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
222220
overwrite: true
223221
path: ./*.elf
224222
retention-days: 30
@@ -244,11 +242,6 @@ jobs:
244242
- name: Checkout
245243
uses: actions/checkout@v5
246244

247-
- name: Setup Python
248-
uses: actions/setup-python@v6
249-
with:
250-
python-version: 3.x
251-
252245
- name: Create release
253246
uses: softprops/action-gh-release@v2
254247
id: create_release
@@ -313,11 +306,6 @@ jobs:
313306
- name: Checkout
314307
uses: actions/checkout@v5
315308

316-
- name: Setup Python
317-
uses: actions/setup-python@v6
318-
with:
319-
python-version: 3.x
320-
321309
- uses: actions/download-artifact@v5
322310
with:
323311
pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
@@ -337,7 +325,7 @@ jobs:
337325

338326
- uses: actions/download-artifact@v5
339327
with:
340-
name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
328+
name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
341329
merge-multiple: true
342330
path: ./elfs
343331

@@ -368,11 +356,6 @@ jobs:
368356
- name: Checkout
369357
uses: actions/checkout@v5
370358

371-
- name: Setup Python
372-
uses: actions/setup-python@v6
373-
with:
374-
python-version: 3.x
375-
376359
- uses: actions/download-artifact@v5
377360
with:
378361
pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}

‎.github/workflows/merge_queue.yml‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
./firmware-*.bin
169169
./firmware-*.uf2
170170
./firmware-*.hex
171-
./firmware-*-ota.zip
171+
./firmware-*.zip
172172
./device-*.sh
173173
./device-*.bat
174174
./littlefs-*.bin
@@ -197,7 +197,7 @@ jobs:
197197
- name: Repackage in single elfs zip
198198
uses: actions/upload-artifact@v4
199199
with:
200-
name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
200+
name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
201201
overwrite: true
202202
path: ./*.elf
203203
retention-days: 30
@@ -223,11 +223,6 @@ jobs:
223223
- name: Checkout
224224
uses: actions/checkout@v5
225225

226-
- name: Setup Python
227-
uses: actions/setup-python@v6
228-
with:
229-
python-version: 3.x
230-
231226
- name: Create release
232227
uses: softprops/action-gh-release@v2
233228
id: create_release
@@ -292,11 +287,6 @@ jobs:
292287
- name: Checkout
293288
uses: actions/checkout@v5
294289

295-
- name: Setup Python
296-
uses: actions/setup-python@v6
297-
with:
298-
python-version: 3.x
299-
300290
- uses: actions/download-artifact@v5
301291
with:
302292
pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
@@ -316,7 +306,7 @@ jobs:
316306

317307
- uses: actions/download-artifact@v5
318308
with:
319-
name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
309+
name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
320310
merge-multiple: true
321311
path: ./elfs
322312

@@ -347,11 +337,6 @@ jobs:
347337
- name: Checkout
348338
uses: actions/checkout@v5
349339

350-
- name: Setup Python
351-
uses: actions/setup-python@v6
352-
with:
353-
python-version: 3.x
354-
355340
- uses: actions/download-artifact@v5
356341
with:
357342
pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}

‎.github/workflows/pr_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
if: needs.native-tests.result != 'skipped'
5353
uses: actions/download-artifact@v5
5454
with:
55-
name: platformio-test-report-${{ steps.version.outputs.long }}.zip
55+
name: platformio-test-report-${{ steps.version.outputs.long }}
5656
merge-multiple: true
5757

5858
- name: Parse test results and create detailed summary

‎.github/workflows/test_native.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
4141
- name: Integration test
4242
run: |
43-
.pio/build/coverage/program -s &
43+
.pio/build/coverage/meshtasticd -s &
4444
PID=$!
4545
timeout 20 bash -c "until ls -al /proc/$PID/fd | grep socket; do sleep 1; done"
4646
echo "Simulator started, launching python test..."
@@ -62,7 +62,7 @@ jobs:
6262
uses: actions/upload-artifact@v4
6363
if: always() # run this step even if previous step failed
6464
with:
65-
name: lcov-coverage-info-native-simulator-test-${{ steps.version.outputs.long }}.zip
65+
name: lcov-coverage-info-native-simulator-test-${{ steps.version.outputs.long }}
6666
overwrite: true
6767
path: ./coverage_*.info
6868

@@ -96,7 +96,7 @@ jobs:
9696
if: always() # run this step even if previous step failed
9797
uses: actions/upload-artifact@v4
9898
with:
99-
name: platformio-test-report-${{ steps.version.outputs.long }}.zip
99+
name: platformio-test-report-${{ steps.version.outputs.long }}
100100
overwrite: true
101101
path: ./testreport.xml
102102

@@ -111,7 +111,7 @@ jobs:
111111
uses: actions/upload-artifact@v4
112112
if: always() # run this step even if previous step failed
113113
with:
114-
name: lcov-coverage-info-native-platformio-tests-${{ steps.version.outputs.long }}.zip
114+
name: lcov-coverage-info-native-platformio-tests-${{ steps.version.outputs.long }}
115115
overwrite: true
116116
path: ./coverage_*.info
117117

@@ -139,7 +139,7 @@ jobs:
139139
- name: Download test artifacts
140140
uses: actions/download-artifact@v5
141141
with:
142-
name: platformio-test-report-${{ steps.version.outputs.long }}.zip
142+
name: platformio-test-report-${{ steps.version.outputs.long }}
143143
merge-multiple: true
144144

145145
- name: Test Report
@@ -152,7 +152,7 @@ jobs:
152152
- name: Download coverage artifacts
153153
uses: actions/download-artifact@v5
154154
with:
155-
pattern: lcov-coverage-info-native-*-${{ steps.version.outputs.long }}.zip
155+
pattern: lcov-coverage-info-native-*-${{ steps.version.outputs.long }}
156156
path: code-coverage-report
157157
merge-multiple: true
158158

@@ -165,5 +165,5 @@ jobs:
165165
- name: Save Code Coverage Report
166166
uses: actions/upload-artifact@v4
167167
with:
168-
name: code-coverage-report-${{ steps.version.outputs.long }}.zip
168+
name: code-coverage-report-${{ steps.version.outputs.long }}
169169
path: code-coverage-report

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Checkout code
2323
uses: actions/checkout@v5
2424

25-
# - uses: actions/setup-python@v5
25+
# - uses: actions/setup-python@v6
2626
# with:
2727
# python-version: '3.10'
2828

0 commit comments

Comments
 (0)