From 48bcd470e23e986114149aed034b937861d732df Mon Sep 17 00:00:00 2001 From: Mikhail Grushinskiy Date: Tue, 3 Dec 2024 12:44:26 -0500 Subject: [PATCH] Update build.yaml --- .github/workflows/build.yaml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 47a83fb..8dddf51 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -32,6 +32,17 @@ jobs: required-libraries: MQTT@2.5.2,LVGL@8.3.11,ArduinoJson@6.21.5,ReactESP@2.1.0 set-build-path: true + - name: Merge BINs + run: | + pwd + $HOME/.arduino15/packages/esp32/tools/esptool_py/4.5.1/esptool.py | + --chip esp32 merge_bin -o /home/runner/work/bbn-m5stack-tough/bbn-m5stack-tough/bbn_m5tough_active_boat/build/bbn_m5tough_active_boat_firmware.bin | + --flash_mode dio --flash_size 16MB | + 0x1000 "$HOME/work/bbn-m5stack-tough/bbn-m5stack-tough/bbn_m5tough_active_boat/build/bbn_m5tough_active_boat.ino.bootloader.bin" | + 0x8000 "$HOME/work/bbn-m5stack-tough/bbn-m5stack-tough/bbn_m5tough_active_boat/build/bbn_m5tough_active_boat.ino.partitions.bin" | + 0xe000 "$HOME/.arduino15/packages/esp32/hardware/esp32/2.0.15/tools/partitions/boot_app0.bin" | + 0x10000 "bbn_m5tough_active_boat.ino.bin" + - name: Make zip run: | ls /home/runner/work/bbn-m5stack-tough/bbn-m5stack-tough/bbn_m5tough_active_boat/build/*.bin | zip bbn_m5tough_active_boat_bin-$(date +%Y-%m-%d).zip -j -@ @@ -47,19 +58,4 @@ jobs: overwrite: true file_glob: true - - name: Look for tools - run: | - pwd - find /home/runner/ -name esptool.py - find /home/runner/ -name boot_app0.bin - - - name: Merge BINs - run: | - pwd - $HOME/.arduino15/packages/esp32/tools/esptool_py/4.5.1/esptool.py | - --chip esp32 merge_bin -o /home/runner/work/bbn-m5stack-tough/bbn-m5stack-tough/bbn_m5tough_active_boat/build/bbn_m5tough_active_boat_firmware.bin | - --flash_mode dio --flash_size 16MB | - 0x1000 "$HOME/work/bbn-m5stack-tough/bbn-m5stack-tough/bbn_m5tough_active_boat/build/bbn_m5tough_active_boat.ino.bootloader.bin" | - 0x8000 "$HOME/work/bbn-m5stack-tough/bbn-m5stack-tough/bbn_m5tough_active_boat/build/bbn_m5tough_active_boat.ino.partitions.bin" | - 0xe000 "$HOME/.arduino15/packages/esp32/hardware/esp32/2.0.15/tools/partitions/boot_app0.bin" | - 0x10000 "bbn_m5tough_active_boat.ino.bin" +