Compare commits

..

28 Commits

Author SHA1 Message Date
bd5b32a3b0 docs: update changelog for version 1.2.51
All checks were successful
Release Workflow / route (push) Successful in 9s
Release Workflow / verify-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m14s
2025-02-19 20:14:54 +01:00
a5c999234c feat: update version to 1.2.51 and add debug output in Gitea release workflow 2025-02-19 20:14:43 +01:00
f64d3e51ce docs: update changelog for version 1.2.50
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m30s
2025-02-19 20:06:08 +01:00
a650b7d860 feat: update version to 1.2.50 and remove obsolete build workflow 2025-02-19 20:05:56 +01:00
14e98072aa docs: update changelog for version 1.2.49
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m0s
2025-02-19 18:24:09 +01:00
0bc4c0565f feat: update version to 1.2.49 and modify changelog reading in Gitea release workflow 2025-02-19 18:24:05 +01:00
4aa8e844ac docs: update changelog for version 1.2.48
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m16s
2025-02-19 18:03:35 +01:00
d7135fddc8 feat: update version to 1.2.48 and modify changelog reading in release workflows 2025-02-19 18:03:31 +01:00
6e3e978839 docs: update changelog for version 1.2.47
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m9s
2025-02-19 17:54:06 +01:00
33b0e79c18 feat: update version to 1.2.47 and modify changelog reading in GitHub release workflow 2025-02-19 17:53:54 +01:00
787d878e83 docs: update changelog for version 1.2.46
All checks were successful
Release Workflow / route (push) Successful in 8s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m5s
2025-02-19 15:09:00 +01:00
1e24179b82 feat: update Gitea release workflow to include changelog and increment version to 1.2.46 2025-02-19 15:08:56 +01:00
67027840f4 docs: update changelog for version 1.2.45
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m14s
2025-02-19 14:11:47 +01:00
2755e9c863 feat: update Gitea release workflow to use dynamic upload URL and increment version to 1.2.45 2025-02-19 14:11:44 +01:00
7ae26fb0a9 docs: update changelog for version 1.2.44
Some checks failed
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 3m9s
2025-02-19 12:57:19 +01:00
98bcf98f1e feat: update Gitea release workflow to include additional outputs and increment version to 1.2.44 2025-02-19 12:57:15 +01:00
bc8ac32fee docs: update changelog for version 1.2.43
Some checks failed
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 3m7s
2025-02-19 12:50:18 +01:00
ba74eca21d feat: update Gitea release workflow by removing unnecessary outputs and increment version to 1.2.43 2025-02-19 12:50:16 +01:00
d4e1cf1322 docs: update changelog for version 1.2.42
Some checks failed
Release Workflow / route (push) Successful in 6s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m48s
2025-02-19 12:44:09 +01:00
5170784e44 feat: update Gitea release workflow to include additional outputs and increment version to 1.2.42 2025-02-19 12:44:07 +01:00
ac323167d0 docs: update changelog for version 1.2.41
Some checks failed
Release Workflow / route (push) Successful in 8s
Release Workflow / verify-provider (push) Successful in 4s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 3m4s
2025-02-19 12:20:02 +01:00
003de5bc00 feat: update Gitea release workflow debug output and increment version to 1.2.41 2025-02-19 12:20:00 +01:00
83595cfadf docs: update changelog for version 1.2.40
Some checks failed
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 3m4s
2025-02-19 12:09:15 +01:00
cfe21d63d7 feat: add inputs for Gitea release workflow and increment version to 1.2.40 2025-02-19 12:09:12 +01:00
63e72076ed docs: update changelog for version 1.2.39
Some checks failed
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 3m12s
2025-02-19 12:02:04 +01:00
2a011ee244 feat: update Gitea release workflow to use Python virtual environment and increment version to 1.2.39 2025-02-19 12:02:01 +01:00
84dd2bd40b docs: update changelog for version 1.2.38
Some checks failed
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 18s
2025-02-19 11:58:29 +01:00
1449cacc0e feat: update Gitea release workflow and increment version to 1.2.38 2025-02-19 11:58:26 +01:00
12 changed files with 141 additions and 120 deletions

View File

@ -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

View File

@ -2,6 +2,19 @@ name: Gitea Release
on:
workflow_call:
inputs:
gitea_ref_name:
description: 'Gitea ref name'
required: true
type: string
gitea_server_url:
description: 'Gitea server URL'
required: true
type: string
gitea_repository:
description: 'Gitea repository'
required: true
type: string
secrets:
GITEA_TOKEN:
required: true
@ -13,39 +26,35 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Install Build Dependencies
- name: Install System Dependencies
run: |
# Add PlatformIO repository
curl -fsSL https://raw.githubusercontent.com/platformio/platformio-core/develop/platformio/assets/system/99-platformio-udev.rules | sudo tee /etc/udev/rules.d/99-platformio-udev.rules
sudo curl -fsSL -o /etc/apt/trusted.gpg.d/platformio.gpg https://github.com/platformio/platformio-core/releases/download/v6.1.11/platformio-keyring.gpg
echo "deb https://github.com/platformio/platformio-core/releases/download/v6.1.11/ any/" | sudo tee /etc/apt/sources.list.d/platformio.list
# Install dependencies
sudo apt-get update
sudo apt-get install -y platformio-core python3-pip build-essential
# Install esptool
sudo pip3 install esptool==4.5.1
sudo apt-get install -y python3 python3-venv build-essential curl git
- name: Set up Python Virtual Environment
run: |
python3 -m venv venv
source venv/bin/activate
pip install --upgrade pip
pip install platformio esptool
echo "Verifying installations:"
pio --version
platformio --version
python3 --version
esptool.py version
- name: Build Firmware
run: |
# Initialize project
pio project init --board esp32dev
source venv/bin/activate
echo "Building SPIFFS..."
pio run -t buildfs -v
platformio run -t buildfs
echo "Building firmware..."
pio run -v
platformio run
- name: Create Release Files
run: |
source venv/bin/activate
echo "Creating release files..."
esptool.py --chip esp32 merge_bin \
--flash_mode dio \
@ -59,19 +68,36 @@ jobs:
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
- name: Read CHANGELOG.md
id: changelog
run: |
ls -alh
CHANGELOG=$(awk "/## \\[${{ inputs.gitea_ref_name }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
echo "$CHANGELOG"
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
echo "$CHANGELOG" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
echo "CHANGELOG CONTENT:"
echo "$CHANGELOG"
- name: Create Release
env:
TOKEN: ${{ secrets.GITEA_TOKEN }}
GITEA_REF_NAME: ${{ inputs.gitea_ref_name }}
GITEA_SERVER_URL: ${{ inputs.gitea_server_url }}
GITEA_REPOSITORY: ${{ inputs.gitea_repository }}
CHANGELOG: ${{ steps.changelog.outputs.CHANGES }}
run: |
echo "Debug environment:"
echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
echo "CHANGELOG: ${CHANGELOG}"
TAG="${GITEA_REF_NAME}"
API_URL="${GITEA_SERVER_URL}/api/v1"
REPO="${GITEA_REPOSITORY}"
echo "Debug environment:"
echo "TAG: ${TAG}"
echo "API_URL: ${API_URL}"
echo "REPO: ${REPO}"
echo "Creating release for ${TAG} on ${REPO}..."
# Create release
@ -79,10 +105,11 @@ jobs:
-X POST \
-H "Authorization: token ${TOKEN}" \
-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")
RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
UPLOAD_URL=$(echo "$RESPONSE" | grep -o '"upload_url":"[^"]*' | cut -d':' -f2- | tr -d '"')
if [ -n "$RELEASE_ID" ]; then
echo "Release created with ID: $RELEASE_ID"
@ -95,7 +122,7 @@ jobs:
-H "Authorization: token ${TOKEN}" \
-H "Content-Type: application/octet-stream" \
--data-binary "@.pio/build/esp32dev/$file" \
"${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
"${UPLOAD_URL}?name=$file"
done
else
echo "Failed to create release. Response:"

View File

@ -10,6 +10,9 @@ jobs:
runs-on: ubuntu-latest
outputs:
provider: ${{ steps.provider.outputs.provider }}
gitea_ref_name: ${{ steps.provider.outputs.gitea_ref_name }}
gitea_server_url: ${{ steps.provider.outputs.gitea_server_url }}
gitea_repository: ${{ steps.provider.outputs.gitea_repository }}
steps:
- name: Checkout Repository
uses: actions/checkout@v3
@ -20,6 +23,7 @@ jobs:
echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}"
echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}"
echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
- name: Determine CI Provider
@ -28,6 +32,9 @@ jobs:
run: |
if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
echo "provider=gitea" >> "$GITHUB_OUTPUT"
echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT"
echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
elif [ "${GITHUB_ACTIONS}" = "true" ]; then
echo "provider=github" >> "$GITHUB_OUTPUT"
else
@ -55,5 +62,9 @@ jobs:
needs: [route, verify-provider]
if: needs.route.outputs.provider == 'gitea'
uses: ./.github/workflows/providers/gitea-release.yml
with:
gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }}
gitea_server_url: ${{ needs.route.outputs.gitea_server_url }}
gitea_repository: ${{ needs.route.outputs.gitea_repository }}
secrets:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}

View File

@ -1,5 +1,75 @@
# Changelog
## [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
### Added
- update Gitea release workflow to use dynamic upload URL and increment version to 1.2.45
## [1.2.44] - 2025-02-19
### Added
- update Gitea release workflow to include additional outputs and increment version to 1.2.44
## [1.2.43] - 2025-02-19
### Added
- update Gitea release workflow by removing unnecessary outputs and increment version to 1.2.43
## [1.2.42] - 2025-02-19
### Added
- update Gitea release workflow to include additional outputs and increment version to 1.2.42
## [1.2.41] - 2025-02-19
### Added
- update Gitea release workflow debug output and increment version to 1.2.41
## [1.2.40] - 2025-02-19
### Added
- add inputs for Gitea release workflow and increment version to 1.2.40
## [1.2.39] - 2025-02-19
### Added
- update Gitea release workflow to use Python virtual environment and increment version to 1.2.39
## [1.2.38] - 2025-02-19
### Added
- update Gitea release workflow and increment version to 1.2.38
## [1.2.37] - 2025-02-19
### Added
- update Gitea release workflow and increment version to 1.2.37

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<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>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<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>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<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>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<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>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<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>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<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>
</div>
</div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo">
<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>
</div>
</div>

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "1.2.37"
version = "1.2.51"
[env:esp32dev]
platform = espressif32