Compare commits

..

13 Commits

5 changed files with 60 additions and 8 deletions

@ -61,7 +61,7 @@ jobs:
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
# Always create 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
# Create full binary (always)
(cd .pio/build/esp32dev &&

@ -103,7 +103,7 @@ jobs:
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.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 0x1000 bootloader.bin 0x8000 partitions.bin 0x10000 firmware.bin 0x390000 spiffs.bin)
echo "File sizes:"
(cd .pio.build/esp32dev && ls -lh *.bin)
(cd .pio/build/esp32dev && ls -lh *.bin)
- name: Get version from platformio.ini
id: get_version
run: |
@ -119,7 +119,7 @@ jobs:
echo "EOF" >> $GITHUB_OUTPUT
- name: Create GitHub Release
env:
GH_TOKEN: ${{ github.token }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
VERSION=${{ steps.get_version.outputs.VERSION }}
cd .pio/build/esp32dev
@ -134,7 +134,28 @@ jobs:
FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_full_${VERSION}.bin"
fi
if [ -n "$FILES_TO_UPLOAD" ]; then
gh release create "v${VERSION}" --title "Release ${VERSION}" --notes "${{ steps.changelog.outputs.CHANGES }}" $FILES_TO_UPLOAD
if [ "${{ needs.route.outputs.provider }}" = "github" ]; then
gh release create "v${VERSION}" --title "Release ${VERSION}" --notes "${{ steps.changelog.outputs.CHANGES }}" $FILES_TO_UPLOAD
elif [ "${{ needs.route.outputs.provider }}" = "gitea" ]; then
API_URL="${{ needs.route.outputs.gitea_server_url }}/api/v1"
REPO="${{ needs.route.outputs.gitea_repository }}"
RESPONSE=$(curl -k -s -X POST -H "Authorization: token ${TOKEN}" -H "Content-Type: application/json" -d "{\"tag_name\":\"v${VERSION}\",\"name\":\"Release ${VERSION}\",\"body\":\"${{ steps.changelog.outputs.CHANGES }}\"}" "${API_URL}/repos/${REPO}/releases")
RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
if [ -n "$RELEASE_ID" ]; then
echo "Release created with ID: $RELEASE_ID"
for file in $FILES_TO_UPLOAD; do
echo "Uploading $file..."
curl -k -s -X POST -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"
done
else
echo "Failed to create release. Response:"
echo "$RESPONSE"
exit 1
fi
else
echo "Error: Unknown provider"
exit 1
fi
else
echo "Error: No files found to upload"
exit 1
@ -189,7 +210,7 @@ jobs:
pio run -e esp32dev
pio run -t buildfs
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
cp .pio/build/esp32dev/spiffs.bin .pio.build/esp32dev/webpage_${VERSION}.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 0x1000 bootloader.bin 0x8000 partitions.bin 0x10000 firmware.bin 0x390000 spiffs.bin)
echo "File sizes:"
(cd .pio/build/esp32dev && ls -lh *.bin)
@ -211,8 +232,6 @@ jobs:
echo "$CHANGELOG" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
- name: Create Release
env:
TOKEN: ${{ secrets.GITEA_TOKEN }}
run: |
API_URL="${{ needs.route.outputs.gitea_server_url }}/api/v1"
REPO="${{ needs.route.outputs.gitea_repository }}"

@ -1,5 +1,38 @@
# Changelog
## [1.3.6] - 2025-02-21
### Changed
- update webpages for version v1.3.6
### Fixed
- update GitHub token reference and correct file path in release workflow
## [1.3.5] - 2025-02-21
### Added
- enhance release workflow to support Gitea alongside GitHub
### Changed
- update webpages for version v1.3.5
## [1.3.4] - 2025-02-21
### Added
- add Gitea and GitHub release workflows
### Changed
- update webpages for version v1.3.4
- Merge branch 'old'
## [1.3.3] - 2025-02-21
### Changed
- update webpages for version v1.3.3
### Fixed
- correct directory path in GitHub workflows for SPIFFS binary
## [1.3.2] - 2025-02-21
### Added
- add missing conditional exit in release workflow

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