From cfc9f103cf7894356c748e766bbb8991eb2464af Mon Sep 17 00:00:00 2001 From: Manuel Weiser Date: Fri, 21 Feb 2025 18:07:43 +0100 Subject: [PATCH] refactor: always create SPIFFS binary in release workflows --- .github/workflows/providers/gitea-release.yml | 27 +++++++++---------- .../workflows/providers/github-release.yml | 13 ++------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/.github/workflows/providers/gitea-release.yml b/.github/workflows/providers/gitea-release.yml index 49ff981..911b2b6 100644 --- a/.github/workflows/providers/gitea-release.yml +++ b/.github/workflows/providers/gitea-release.yml @@ -74,23 +74,20 @@ jobs: # Copy firmware binary cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin - # Copy SPIFFS binary if SPIFFS changed - if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then - echo "SPIFFS changes detected, copying SPIFFS binary..." - cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin - fi + # Always create SPIFFS binary + cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin # Create full binary (always) - (cd .pio/build/esp32dev && \ - esptool.py --chip esp32 merge_bin \ - --fill-flash-size 4MB \ - --flash_mode dio \ - --flash_freq 40m \ - --flash_size 4MB \ - -o filaman_full_${VERSION}.bin \ - 0x0000 bootloader.bin \ - 0x8000 partitions.bin \ - 0x10000 firmware.bin \ + (cd .pio/build/esp32dev && + esptool.py --chip esp32 merge_bin + --fill-flash-size 4MB + --flash_mode dio + --flash_freq 40m + --flash_size 4MB + -o filaman_full_${VERSION}.bin + 0x0000 bootloader.bin + 0x8000 partitions.bin + 0x10000 firmware.bin 0x390000 spiffs.bin) # Verify file sizes diff --git a/.github/workflows/providers/github-release.yml b/.github/workflows/providers/github-release.yml index ed58211..04a4bb9 100644 --- a/.github/workflows/providers/github-release.yml +++ b/.github/workflows/providers/github-release.yml @@ -60,11 +60,8 @@ jobs: # Copy firmware binary cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin - # Copy SPIFFS binary if SPIFFS changed - if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then - echo "SPIFFS changes detected, copying SPIFFS binary..." - cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin - fi + # Always create SPIFFS binary + cp .pio/build/esp32dev/spiffs.bin .pio.build/esp32dev/webpage_${VERSION}.bin # Create full binary (always) (cd .pio/build/esp32dev && \ @@ -79,12 +76,6 @@ jobs: 0x10000 firmware.bin \ 0x390000 spiffs.bin) - # Only copy SPIFFS binary if data changed - if [[ "${{ steps.check_data.outputs.DATA_CHANGED }}" == "true" ]]; then - echo "Data changes detected, copying SPIFFS binary..." - cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin - fi - # Verify file sizes echo "File sizes:" (cd .pio/build/esp32dev && ls -lh *.bin)