iarv/mesh-forge
1
0
Fork 1
mirror of https://github.com/MeshEnvy/mesh-forge.git synced 2026-05-15 05:45:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

ota fix

Browse Source
This commit is contained in:
Ben Allfree
2026-04-11 17:00:51 -07:00
parent 1ec72c81b4
commit 6ae29bca59
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/custom_build.yml
+5 -2
View File
@@ -196,12 +196,15 @@ jobs:
BUILD_DIR="$ROOT/.pio/build/${{ inputs.target_env }}"
MERGED="$BUILD_DIR/firmware-merged.factory.bin"
PARTS="$BUILD_DIR/partitions.bin"
OTA_BIN=$(ls "$BUILD_DIR"/mt-*.ota.bin "$BUILD_DIR"/bleota-c3.bin 2>/dev/null | head -1)
OTA_BIN=""
for candidate in "$BUILD_DIR"/mt-*.ota.bin "$BUILD_DIR/bleota-c3.bin"; do
if [ -f "$candidate" ]; then OTA_BIN="$candidate"; break; fi
done
if [ -f "$MERGED" ] && [ -f "$PARTS" ] && [ -n "$OTA_BIN" ]; then
python3 "${{ github.workspace }}/scripts/extend-merged-with-ota.py" \
"$MERGED" "$PARTS" "$OTA_BIN"
else
echo "Skipping OTA extension (merged=$( [ -f "$MERGED" ] && echo yes || echo no), ota=$( [ -n "$OTA_BIN" ] && echo yes || echo no))"
echo "Skipping OTA extension (merged=$([ -f "$MERGED" ] && echo yes || echo no), ota=$([ -n "$OTA_BIN" ] && echo yes || echo no))"
fi
- name: Stage or generate nRF52 DFU files (if applicable)
.github/workflows/custom_build_test.yml
+5 -2
View File
@@ -196,12 +196,15 @@ jobs:
BUILD_DIR="$ROOT/.pio/build/${{ inputs.target_env }}"
MERGED="$BUILD_DIR/firmware-merged.factory.bin"
PARTS="$BUILD_DIR/partitions.bin"
OTA_BIN=$(ls "$BUILD_DIR"/mt-*.ota.bin "$BUILD_DIR"/bleota-c3.bin 2>/dev/null | head -1)
OTA_BIN=""
for candidate in "$BUILD_DIR"/mt-*.ota.bin "$BUILD_DIR/bleota-c3.bin"; do
if [ -f "$candidate" ]; then OTA_BIN="$candidate"; break; fi
done
if [ -f "$MERGED" ] && [ -f "$PARTS" ] && [ -n "$OTA_BIN" ]; then
python3 "${{ github.workspace }}/scripts/extend-merged-with-ota.py" \
"$MERGED" "$PARTS" "$OTA_BIN"
else
echo "Skipping OTA extension (merged=$( [ -f "$MERGED" ] && echo yes || echo no), ota=$( [ -n "$OTA_BIN" ] && echo yes || echo no))"
echo "Skipping OTA extension (merged=$([ -f "$MERGED" ] && echo yes || echo no), ota=$([ -n "$OTA_BIN" ] && echo yes || echo no))"
fi
- name: Stage or generate nRF52 DFU files (if applicable)