Compare commits
16 Commits
67027840f4
...
v1.2.53
Author | SHA1 | Date | |
---|---|---|---|
77032bf9ae | |||
3967366ae6 | |||
cd391378c2 | |||
3fc3a689cb | |||
bd5b32a3b0 | |||
a5c999234c | |||
f64d3e51ce | |||
a650b7d860 | |||
14e98072aa | |||
0bc4c0565f | |||
4aa8e844ac | |||
d7135fddc8 | |||
6e3e978839 | |||
33b0e79c18 | |||
787d878e83 | |||
1e24179b82 |
87
.github/workflows/providers/build.yml
vendored
87
.github/workflows/providers/build.yml
vendored
@ -1,87 +0,0 @@
|
|||||||
name: Build Firmware
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_call:
|
|
||||||
outputs:
|
|
||||||
version:
|
|
||||||
description: "The version from the tag"
|
|
||||||
value: ${{ jobs.build.outputs.version }}
|
|
||||||
changelog:
|
|
||||||
description: "The changelog for the current version"
|
|
||||||
value: ${{ jobs.build.outputs.changelog }}
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
outputs:
|
|
||||||
version: ${{ steps.get_version.outputs.VERSION }}
|
|
||||||
changelog: ${{ steps.changelog.outputs.CHANGES }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v4
|
|
||||||
with:
|
|
||||||
python-version: '3.x'
|
|
||||||
|
|
||||||
- name: Install PlatformIO
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install --upgrade platformio
|
|
||||||
|
|
||||||
- name: Build Firmware
|
|
||||||
run: |
|
|
||||||
pio run -t buildfs # Build SPIFFS
|
|
||||||
pio run # Build firmware
|
|
||||||
|
|
||||||
- name: Install esptool
|
|
||||||
run: |
|
|
||||||
pip install esptool
|
|
||||||
|
|
||||||
- name: Merge firmware and SPIFFS
|
|
||||||
run: |
|
|
||||||
esptool.py --chip esp32 merge_bin \
|
|
||||||
--flash_mode dio \
|
|
||||||
--flash_freq 40m \
|
|
||||||
--flash_size 4MB \
|
|
||||||
-o .pio/build/esp32dev/filaman_full.bin \
|
|
||||||
0x1000 .pio/build/esp32dev/bootloader.bin \
|
|
||||||
0x8000 .pio/build/esp32dev/partitions.bin \
|
|
||||||
0x10000 .pio/build/esp32dev/firmware.bin \
|
|
||||||
0x290000 .pio/build/esp32dev/spiffs.bin
|
|
||||||
|
|
||||||
- name: Prepare OTA firmware
|
|
||||||
run: |
|
|
||||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
|
|
||||||
|
|
||||||
- name: Get version from tag
|
|
||||||
id: get_version
|
|
||||||
run: |
|
|
||||||
if [ -n "$GITEA_REF" ]; then
|
|
||||||
echo "VERSION=${GITEA_REF#refs/tags/v}" >> $GITEA_OUTPUT
|
|
||||||
else
|
|
||||||
echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Read CHANGELOG.md
|
|
||||||
id: changelog
|
|
||||||
run: |
|
|
||||||
VERSION=${{ steps.get_version.outputs.VERSION }}
|
|
||||||
CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
|
|
||||||
if [ -n "$GITEA_OUTPUT" ]; then
|
|
||||||
echo "CHANGES<<EOF" >> $GITEA_OUTPUT
|
|
||||||
echo "$CHANGELOG" >> $GITEA_OUTPUT
|
|
||||||
echo "EOF" >> $GITEA_OUTPUT
|
|
||||||
else
|
|
||||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
|
||||||
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
|
||||||
echo "EOF" >> $GITHUB_OUTPUT
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Upload artifacts
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: firmware
|
|
||||||
path: |
|
|
||||||
.pio/build/esp32dev/filaman_full.bin
|
|
||||||
.pio/build/esp32dev/filaman_ota.bin
|
|
18
.github/workflows/providers/gitea-release.yml
vendored
18
.github/workflows/providers/gitea-release.yml
vendored
@ -68,17 +68,33 @@ jobs:
|
|||||||
|
|
||||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
|
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
|
||||||
|
|
||||||
|
- name: Read CHANGELOG.md
|
||||||
|
id: changelog
|
||||||
|
run: |
|
||||||
|
VERSION=${{ inputs.gitea_ref_name }}
|
||||||
|
CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/ {p=0} p" CHANGELOG.md)
|
||||||
|
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||||
|
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
||||||
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
|
echo "CHANGELOG CONTENT:"
|
||||||
|
echo "$CHANGELOG"
|
||||||
|
if [ -z "$CHANGELOG" ]; then
|
||||||
|
echo "No changelog found for version $VERSION"
|
||||||
|
exit 1
|
||||||
|
|
||||||
- name: Create Release
|
- name: Create Release
|
||||||
env:
|
env:
|
||||||
TOKEN: ${{ secrets.GITEA_TOKEN }}
|
TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||||
GITEA_REF_NAME: ${{ inputs.gitea_ref_name }}
|
GITEA_REF_NAME: ${{ inputs.gitea_ref_name }}
|
||||||
GITEA_SERVER_URL: ${{ inputs.gitea_server_url }}
|
GITEA_SERVER_URL: ${{ inputs.gitea_server_url }}
|
||||||
GITEA_REPOSITORY: ${{ inputs.gitea_repository }}
|
GITEA_REPOSITORY: ${{ inputs.gitea_repository }}
|
||||||
|
CHANGELOG: ${{ steps.changelog.outputs.CHANGES }}
|
||||||
run: |
|
run: |
|
||||||
echo "Debug environment:"
|
echo "Debug environment:"
|
||||||
echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
|
echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
|
||||||
echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
|
echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
|
||||||
echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
|
echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
|
||||||
|
echo "CHANGELOG: ${CHANGELOG}"
|
||||||
|
|
||||||
TAG="${GITEA_REF_NAME}"
|
TAG="${GITEA_REF_NAME}"
|
||||||
API_URL="${GITEA_SERVER_URL}/api/v1"
|
API_URL="${GITEA_SERVER_URL}/api/v1"
|
||||||
@ -91,7 +107,7 @@ jobs:
|
|||||||
-X POST \
|
-X POST \
|
||||||
-H "Authorization: token ${TOKEN}" \
|
-H "Authorization: token ${TOKEN}" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\"}" \
|
-d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\",\"body\":\"${CHANGELOG}\"}" \
|
||||||
"${API_URL}/repos/${REPO}/releases")
|
"${API_URL}/repos/${REPO}/releases")
|
||||||
|
|
||||||
RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
|
RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
|
||||||
|
40
CHANGELOG.md
40
CHANGELOG.md
@ -1,5 +1,45 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.2.53] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update version to 1.2.53 and enhance Gitea release workflow to handle missing changelog
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.52] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update version to 1.2.52 and improve Gitea release workflow output handling
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.51] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update version to 1.2.51 and add debug output in Gitea release workflow
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.50] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update version to 1.2.50 and remove obsolete build workflow
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.49] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update version to 1.2.49 and modify changelog reading in Gitea release workflow
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.48] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update version to 1.2.48 and modify changelog reading in release workflows
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.47] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update version to 1.2.47 and modify changelog reading in GitHub release workflow
|
||||||
|
|
||||||
|
|
||||||
|
## [1.2.46] - 2025-02-19
|
||||||
|
### Added
|
||||||
|
- update Gitea release workflow to include changelog and increment version to 1.2.46
|
||||||
|
|
||||||
|
|
||||||
## [1.2.45] - 2025-02-19
|
## [1.2.45] - 2025-02-19
|
||||||
### Added
|
### Added
|
||||||
- update Gitea release workflow to use dynamic upload URL and increment version to 1.2.45
|
- update Gitea release workflow to use dynamic upload URL and increment version to 1.2.45
|
||||||
|
@ -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.29</span></h1>
|
<h1>FilaMan<span class="version">v1.2.47</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.29</span></h1>
|
<h1>FilaMan<span class="version">v1.2.47</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.29</span></h1>
|
<h1>FilaMan<span class="version">v1.2.47</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.29</span></h1>
|
<h1>FilaMan<span class="version">v1.2.47</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.29</span></h1>
|
<h1>FilaMan<span class="version">v1.2.47</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.29</span></h1>
|
<h1>FilaMan<span class="version">v1.2.47</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.29</span></h1>
|
<h1>FilaMan<span class="version">v1.2.47</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.45"
|
version = "1.2.53"
|
||||||
|
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
|
Reference in New Issue
Block a user