Compare commits
16 Commits
Author | SHA1 | Date | |
---|---|---|---|
8d003295e7 | |||
f89500946a | |||
14e745ff06 | |||
d058397fa2 | |||
622f5403a7 | |||
92b78a86dd | |||
ec399390e8 | |||
909c4e9b5e | |||
f4b20bfffd | |||
78464215a9 | |||
4365f0463a | |||
727bc0e760 | |||
04604013eb | |||
cf5fc5f6f1 | |||
945a4ccce6 | |||
7cf9e2d145 |
@ -61,7 +61,7 @@ jobs:
|
|||||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
|
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
|
||||||
|
|
||||||
# Always create SPIFFS binary
|
# 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)
|
# Create full binary (always)
|
||||||
(cd .pio/build/esp32dev &&
|
(cd .pio/build/esp32dev &&
|
30
.github/workflows/release.yml
vendored
30
.github/workflows/release.yml
vendored
@ -51,6 +51,7 @@ jobs:
|
|||||||
if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
|
if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
|
||||||
echo "::error::Failed to detect CI provider!"
|
echo "::error::Failed to detect CI provider!"
|
||||||
exit 1
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
github-release:
|
github-release:
|
||||||
needs: [route, verify-provider]
|
needs: [route, verify-provider]
|
||||||
@ -102,7 +103,7 @@ jobs:
|
|||||||
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)
|
(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:"
|
echo "File sizes:"
|
||||||
(cd .pio.build/esp32dev && ls -lh *.bin)
|
(cd .pio/build/esp32dev && ls -lh *.bin)
|
||||||
- name: Get version from platformio.ini
|
- name: Get version from platformio.ini
|
||||||
id: get_version
|
id: get_version
|
||||||
run: |
|
run: |
|
||||||
@ -118,7 +119,7 @@ jobs:
|
|||||||
echo "EOF" >> $GITHUB_OUTPUT
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
- name: Create GitHub Release
|
- name: Create GitHub Release
|
||||||
env:
|
env:
|
||||||
GH_TOKEN: ${{ github.token }}
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
run: |
|
run: |
|
||||||
VERSION=${{ steps.get_version.outputs.VERSION }}
|
VERSION=${{ steps.get_version.outputs.VERSION }}
|
||||||
cd .pio/build/esp32dev
|
cd .pio/build/esp32dev
|
||||||
@ -133,7 +134,28 @@ jobs:
|
|||||||
FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_full_${VERSION}.bin"
|
FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_full_${VERSION}.bin"
|
||||||
fi
|
fi
|
||||||
if [ -n "$FILES_TO_UPLOAD" ]; then
|
if [ -n "$FILES_TO_UPLOAD" ]; then
|
||||||
|
if [ "${{ needs.route.outputs.provider }}" = "github" ]; then
|
||||||
gh release create "v${VERSION}" --title "Release ${VERSION}" --notes "${{ steps.changelog.outputs.CHANGES }}" $FILES_TO_UPLOAD
|
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
|
else
|
||||||
echo "Error: No files found to upload"
|
echo "Error: No files found to upload"
|
||||||
exit 1
|
exit 1
|
||||||
@ -188,7 +210,7 @@ jobs:
|
|||||||
pio run -e esp32dev
|
pio run -e esp32dev
|
||||||
pio run -t buildfs
|
pio run -t buildfs
|
||||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
|
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)
|
(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:"
|
echo "File sizes:"
|
||||||
(cd .pio/build/esp32dev && ls -lh *.bin)
|
(cd .pio/build/esp32dev && ls -lh *.bin)
|
||||||
@ -210,8 +232,6 @@ jobs:
|
|||||||
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
echo "$CHANGELOG" >> $GITHUB_OUTPUT
|
||||||
echo "EOF" >> $GITHUB_OUTPUT
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
- name: Create Release
|
- name: Create Release
|
||||||
env:
|
|
||||||
TOKEN: ${{ secrets.GITEA_TOKEN }}
|
|
||||||
run: |
|
run: |
|
||||||
API_URL="${{ needs.route.outputs.gitea_server_url }}/api/v1"
|
API_URL="${{ needs.route.outputs.gitea_server_url }}/api/v1"
|
||||||
REPO="${{ needs.route.outputs.gitea_repository }}"
|
REPO="${{ needs.route.outputs.gitea_repository }}"
|
||||||
|
41
CHANGELOG.md
41
CHANGELOG.md
@ -1,5 +1,46 @@
|
|||||||
# Changelog
|
# 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
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.2
|
||||||
|
|
||||||
|
|
||||||
## [1.3.1] - 2025-02-21
|
## [1.3.1] - 2025-02-21
|
||||||
### Added
|
### Added
|
||||||
- enhance GitHub and Gitea release workflows with Python setup and binary preparation
|
- enhance GitHub and Gitea release workflows with Python setup and binary preparation
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.3.1"
|
version = "1.3.6"
|
||||||
|
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
|
Reference in New Issue
Block a user