3D-Druck/Filaman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 110 Wiki Activity

refactor: always create SPIFFS binary in release workflows

Browse Source
This commit is contained in:
Manuel Weiser 2025-02-21 18:07:43 +01:00
parent 0117302672
commit cfc9f103cf
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.github/workflows/providers/gitea-release.yml vendored
View File

@ -74,23 +74,20 @@ jobs:
# Copy firmware binary # Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
# Copy SPIFFS binary if SPIFFS changed # Always create SPIFFS binary
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 cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
fi
# Create full binary (always) # Create full binary (always)
(cd .pio/build/esp32dev && \ (cd .pio/build/esp32dev &&
esptool.py --chip esp32 merge_bin \ esptool.py --chip esp32 merge_bin
--fill-flash-size 4MB \ --fill-flash-size 4MB
--flash_mode dio \ --flash_mode dio
--flash_freq 40m \ --flash_freq 40m
--flash_size 4MB \ --flash_size 4MB
-o filaman_full_${VERSION}.bin \ -o filaman_full_${VERSION}.bin
0x0000 bootloader.bin \ 0x0000 bootloader.bin
0x8000 partitions.bin \ 0x8000 partitions.bin
0x10000 firmware.bin \ 0x10000 firmware.bin
0x390000 spiffs.bin) 0x390000 spiffs.bin)
# Verify file sizes # Verify file sizes

13
.github/workflows/providers/github-release.yml vendored
View File

@ -60,11 +60,8 @@ jobs:
# Copy firmware binary # Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
# Copy SPIFFS binary if SPIFFS changed # Always create SPIFFS binary
if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then cp .pio/build/esp32dev/spiffs.bin .pio.build/esp32dev/webpage_${VERSION}.bin
echo "SPIFFS changes detected, copying SPIFFS binary..."
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
fi
# Create full binary (always) # Create full binary (always)
(cd .pio/build/esp32dev && \ (cd .pio/build/esp32dev && \
@ -79,12 +76,6 @@ jobs:
0x10000 firmware.bin \ 0x10000 firmware.bin \
0x390000 spiffs.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 # Verify file sizes
echo "File sizes:" echo "File sizes:"
(cd .pio/build/esp32dev && ls -lh *.bin) (cd .pio/build/esp32dev && ls -lh *.bin)