Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
e983ba6e44 | |||
37171d6eca | |||
ebb08a7a66 | |||
b5330af351 | |||
4919d34484 | |||
2da641d604 | |||
ce413965c7 | |||
3fafed930e | |||
e1c604ee8d |
11
.github/workflows/providers/gitea-release.yml
vendored
11
.github/workflows/providers/gitea-release.yml
vendored
@ -32,6 +32,11 @@ jobs:
|
|||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
pip install --upgrade platformio esptool
|
pip install --upgrade platformio esptool
|
||||||
|
|
||||||
|
- name: Install xxd
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install xxd
|
||||||
|
|
||||||
- name: Build Firmware
|
- name: Build Firmware
|
||||||
run: |
|
run: |
|
||||||
pio run -e esp32dev_ota -t buildfs # Build SPIFFS
|
pio run -e esp32dev_ota -t buildfs # Build SPIFFS
|
||||||
@ -64,10 +69,8 @@ jobs:
|
|||||||
|
|
||||||
# Verify magic bytes
|
# Verify magic bytes
|
||||||
echo "Checking magic bytes:"
|
echo "Checking magic bytes:"
|
||||||
echo "OTA binary first bytes:"
|
|
||||||
hexdump -C -n 16 filaman_ota.bin
|
|
||||||
echo "Full binary first bytes:"
|
echo "Full binary first bytes:"
|
||||||
hexdump -C -n 16 filaman_full.bin
|
xxd -l 16 filaman_full.bin
|
||||||
|
|
||||||
# Verify file sizes
|
# Verify file sizes
|
||||||
echo "File sizes:"
|
echo "File sizes:"
|
||||||
@ -100,7 +103,7 @@ jobs:
|
|||||||
|
|
||||||
# Upload binaries
|
# Upload binaries
|
||||||
cd .pio/build/esp32dev_ota
|
cd .pio/build/esp32dev_ota
|
||||||
for file in filaman_full.bin filaman_ota.bin filaman.bin filaman_spiffs.bin; do
|
for file in filaman_full.bin; do
|
||||||
echo "Uploading $file..."
|
echo "Uploading $file..."
|
||||||
curl -k -s \
|
curl -k -s \
|
||||||
-X POST \
|
-X POST \
|
||||||
|
14
.github/workflows/providers/github-release.yml
vendored
14
.github/workflows/providers/github-release.yml
vendored
@ -21,6 +21,11 @@ jobs:
|
|||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
pip install --upgrade platformio esptool
|
pip install --upgrade platformio esptool
|
||||||
|
|
||||||
|
- name: Install xxd
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install xxd
|
||||||
|
|
||||||
- name: Build Firmware
|
- name: Build Firmware
|
||||||
run: |
|
run: |
|
||||||
pio run -e esp32dev_ota -t buildfs # Build SPIFFS
|
pio run -e esp32dev_ota -t buildfs # Build SPIFFS
|
||||||
@ -53,10 +58,8 @@ jobs:
|
|||||||
|
|
||||||
# Verify magic bytes
|
# Verify magic bytes
|
||||||
echo "Checking magic bytes:"
|
echo "Checking magic bytes:"
|
||||||
echo "OTA binary first bytes:"
|
|
||||||
hexdump -C -n 16 filaman_ota.bin
|
|
||||||
echo "Full binary first bytes:"
|
echo "Full binary first bytes:"
|
||||||
hexdump -C -n 16 filaman_full.bin
|
xxd -l 16 filaman_full.bin
|
||||||
|
|
||||||
# Verify file sizes
|
# Verify file sizes
|
||||||
echo "File sizes:"
|
echo "File sizes:"
|
||||||
@ -83,7 +86,4 @@ jobs:
|
|||||||
gh release create "${{ github.ref_name }}" \
|
gh release create "${{ github.ref_name }}" \
|
||||||
--title "Release ${{ steps.get_version.outputs.VERSION }}" \
|
--title "Release ${{ steps.get_version.outputs.VERSION }}" \
|
||||||
--notes "${{ steps.changelog.outputs.CHANGES }}" \
|
--notes "${{ steps.changelog.outputs.CHANGES }}" \
|
||||||
.pio/build/esp32dev_ota/filaman_full.bin \
|
.pio/build/esp32dev_ota/filaman_full.bin
|
||||||
.pio/build/esp32dev_ota/filaman_ota.bin \
|
|
||||||
.pio/build/esp32dev_ota/filaman.bin \
|
|
||||||
.pio/build/esp32dev_ota/filaman_spiffs.bin
|
|
20
CHANGELOG.md
20
CHANGELOG.md
@ -1,5 +1,25 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.2.85] - 2025-02-20
|
||||||
|
### Added
|
||||||
|
- ci: streamline release workflows by removing unnecessary binary uploads and adding SPIFFS formatting
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.2.85
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.84] - 2025-02-20
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.2.84
|
||||||
|
- ci: update installation steps for xxd to include package list update
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.83] - 2025-02-20
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.2.83
|
||||||
|
- replace hexdump with xxd for magic byte verification in release workflows
|
||||||
|
|
||||||
|
|
||||||
## [1.2.82] - 2025-02-20
|
## [1.2.82] - 2025-02-20
|
||||||
### Changed
|
### Changed
|
||||||
- update webpages for version v1.2.82
|
- update webpages for version v1.2.82
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<div style="display: flex; align-items: center; gap: 2rem;">
|
<div style="display: flex; align-items: center; gap: 2rem;">
|
||||||
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
||||||
<div class="logo-text">
|
<div class="logo-text">
|
||||||
<h1>FilaMan<span class="version">v1.2.82</span></h1>
|
<h1>FilaMan<span class="version">v1.2.85</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<div style="display: flex; align-items: center; gap: 2rem;">
|
<div style="display: flex; align-items: center; gap: 2rem;">
|
||||||
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
||||||
<div class="logo-text">
|
<div class="logo-text">
|
||||||
<h1>FilaMan<span class="version">v1.2.82</span></h1>
|
<h1>FilaMan<span class="version">v1.2.85</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<div style="display: flex; align-items: center; gap: 2rem;">
|
<div style="display: flex; align-items: center; gap: 2rem;">
|
||||||
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
||||||
<div class="logo-text">
|
<div class="logo-text">
|
||||||
<h1>FilaMan<span class="version">v1.2.82</span></h1>
|
<h1>FilaMan<span class="version">v1.2.85</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<div style="display: flex; align-items: center; gap: 2rem;">
|
<div style="display: flex; align-items: center; gap: 2rem;">
|
||||||
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
||||||
<div class="logo-text">
|
<div class="logo-text">
|
||||||
<h1>FilaMan<span class="version">v1.2.82</span></h1>
|
<h1>FilaMan<span class="version">v1.2.85</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<div style="display: flex; align-items: center; gap: 2rem;">
|
<div style="display: flex; align-items: center; gap: 2rem;">
|
||||||
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
||||||
<div class="logo-text">
|
<div class="logo-text">
|
||||||
<h1>FilaMan<span class="version">v1.2.82</span></h1>
|
<h1>FilaMan<span class="version">v1.2.85</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<div style="display: flex; align-items: center; gap: 2rem;">
|
<div style="display: flex; align-items: center; gap: 2rem;">
|
||||||
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
||||||
<div class="logo-text">
|
<div class="logo-text">
|
||||||
<h1>FilaMan<span class="version">v1.2.82</span></h1>
|
<h1>FilaMan<span class="version">v1.2.85</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<div style="display: flex; align-items: center; gap: 2rem;">
|
<div style="display: flex; align-items: center; gap: 2rem;">
|
||||||
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
<img src="/logo.png" alt="FilaMan Logo" class="logo">
|
||||||
<div class="logo-text">
|
<div class="logo-text">
|
||||||
<h1>FilaMan<span class="version">v1.2.82</span></h1>
|
<h1>FilaMan<span class="version">v1.2.85</span></h1>
|
||||||
<h4>Filament Management Tool</h4>
|
<h4>Filament Management Tool</h4>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.2.82"
|
version = "1.2.85"
|
||||||
|
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
|
@ -4,4 +4,18 @@ Import("env")
|
|||||||
exec(open("./scripts/pre_build.py").read())
|
exec(open("./scripts/pre_build.py").read())
|
||||||
|
|
||||||
# Bind to SPIFFS build
|
# Bind to SPIFFS build
|
||||||
env.AddPreAction("buildfs", replace_version)
|
env.AddPreAction("buildfs", replace_version)
|
||||||
|
|
||||||
|
import os
|
||||||
|
import shutil
|
||||||
|
from SCons.Script import DefaultEnvironment
|
||||||
|
|
||||||
|
env = DefaultEnvironment()
|
||||||
|
|
||||||
|
# Format SPIFFS partition before uploading new files
|
||||||
|
spiffs_dir = os.path.join(env.subst("$BUILD_DIR"), "spiffs")
|
||||||
|
if os.path.exists(spiffs_dir):
|
||||||
|
shutil.rmtree(spiffs_dir)
|
||||||
|
os.makedirs(spiffs_dir)
|
||||||
|
|
||||||
|
print("SPIFFS partition formatted.")
|
Reference in New Issue
Block a user