Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
b8beb992d6 | |||
4234b2254e | |||
b8faf79163 | |||
d35afaff46 | |||
a8a00372b5 | |||
72f4eab588 | |||
afa4eddc00 | |||
b0888e7e63 | |||
238a84a8a2 | |||
59cc00ca13 | |||
ab083f5f57 | |||
c111573206 | |||
52b2494e52 |
6
.github/workflows/gitea-release.yml
vendored
6
.github/workflows/gitea-release.yml
vendored
@ -34,10 +34,10 @@ jobs:
|
|||||||
pio run -t buildfs
|
pio run -t buildfs
|
||||||
|
|
||||||
# Copy firmware binary
|
# Copy firmware binary
|
||||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
|
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
||||||
|
|
||||||
# Create SPIFFS binary
|
# Create SPIFFS binary
|
||||||
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
|
cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||||
|
|
||||||
# Create full binary
|
# Create full binary
|
||||||
(cd .pio/build/esp32dev &&
|
(cd .pio/build/esp32dev &&
|
||||||
@ -78,7 +78,7 @@ jobs:
|
|||||||
|
|
||||||
# Prepare files for upload
|
# Prepare files for upload
|
||||||
FILES=""
|
FILES=""
|
||||||
for file in filaman_${VERSION}.bin webpage_${VERSION}.bin filaman_full_${VERSION}.bin; do
|
for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${VERSION}.bin filaman_full_${VERSION}.bin; do
|
||||||
if [ -f "$file" ]; then
|
if [ -f "$file" ]; then
|
||||||
FILES="$FILES -a $file"
|
FILES="$FILES -a $file"
|
||||||
fi
|
fi
|
||||||
|
65
.github/workflows/github-release.yml
vendored
65
.github/workflows/github-release.yml
vendored
@ -3,7 +3,7 @@ name: GitHub Release
|
|||||||
on:
|
on:
|
||||||
workflow_call:
|
workflow_call:
|
||||||
secrets:
|
secrets:
|
||||||
GITHUB_TOKEN:
|
RELEASE_TOKEN:
|
||||||
description: 'GitHub token for release creation'
|
description: 'GitHub token for release creation'
|
||||||
required: true
|
required: true
|
||||||
|
|
||||||
@ -17,6 +17,8 @@ jobs:
|
|||||||
contents: write
|
contents: write
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v4
|
||||||
@ -65,10 +67,10 @@ jobs:
|
|||||||
pio run -t buildfs
|
pio run -t buildfs
|
||||||
|
|
||||||
# Copy firmware binary
|
# Copy firmware binary
|
||||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
|
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${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/upgrade_filaman_website_v${VERSION}.bin
|
||||||
|
|
||||||
# Create full binary (always)
|
# Create full binary (always)
|
||||||
(cd .pio/build/esp32dev &&
|
(cd .pio/build/esp32dev &&
|
||||||
@ -104,40 +106,35 @@ jobs:
|
|||||||
|
|
||||||
- name: Create GitHub Release
|
- name: Create GitHub Release
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
|
||||||
run: |
|
run: |
|
||||||
VERSION=${{ steps.get_version.outputs.VERSION }}
|
VERSION=${{ steps.get_version.outputs.VERSION }}
|
||||||
cd .pio/build/esp32dev
|
cd .pio/build/esp32dev
|
||||||
|
|
||||||
# Create the release first
|
# Create release with available files
|
||||||
RELEASE_JSON=$(curl -L \
|
FILES_TO_UPLOAD=""
|
||||||
-X POST \
|
|
||||||
-H "Accept: application/vnd.github+json" \
|
|
||||||
-H "Authorization: Bearer $GITHUB_TOKEN" \
|
|
||||||
-H "X-GitHub-Api-Version: 2022-11-28" \
|
|
||||||
"https://api.github.com/repos/$GITHUB_REPOSITORY/releases" \
|
|
||||||
-d "{
|
|
||||||
\"tag_name\":\"v${VERSION}\",
|
|
||||||
\"name\":\"Release ${VERSION}\",
|
|
||||||
\"body\":\"${{ steps.changelog.outputs.CHANGES }}\",
|
|
||||||
\"draft\":false,
|
|
||||||
\"prerelease\":false
|
|
||||||
}")
|
|
||||||
|
|
||||||
# Extract the upload URL from the response
|
# Always add firmware
|
||||||
UPLOAD_URL=$(echo "$RELEASE_JSON" | jq -r .upload_url | sed 's/{?name,label}//')
|
if [ -f "update_filaman_firmware_v${VERSION}.bin" ]; then
|
||||||
|
FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_firmware_v${VERSION}.bin"
|
||||||
|
fi
|
||||||
|
|
||||||
# Upload the binary files
|
# Add SPIFFS and full binary only if they exist
|
||||||
for file in filaman_${VERSION}.bin webpage_${VERSION}.bin filaman_full_${VERSION}.bin; do
|
if [ -f "update_filaman_website_v${VERSION}.bin" ]; then
|
||||||
if [ -f "$file" ]; then
|
FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin"
|
||||||
echo "Uploading $file..."
|
fi
|
||||||
curl -L \
|
|
||||||
-X POST \
|
if [ -f "filaman_full_${VERSION}.bin" ]; then
|
||||||
-H "Accept: application/vnd.github+json" \
|
FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_full_${VERSION}.bin"
|
||||||
-H "Authorization: Bearer $GITHUB_TOKEN" \
|
fi
|
||||||
-H "X-GitHub-Api-Version: 2022-11-28" \
|
|
||||||
-H "Content-Type: application/octet-stream" \
|
# Create release with available files
|
||||||
"${UPLOAD_URL}?name=${file}" \
|
if [ -n "$FILES_TO_UPLOAD" ]; then
|
||||||
--data-binary "@${file}"
|
gh release create "v${VERSION}" \
|
||||||
fi
|
--title "Release ${VERSION}" \
|
||||||
done
|
--notes "${{ steps.changelog.outputs.CHANGES }}" \
|
||||||
|
$FILES_TO_UPLOAD
|
||||||
|
else
|
||||||
|
echo "Error: No files found to upload"
|
||||||
|
exit 1
|
||||||
|
fi
|
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@ -31,7 +31,7 @@ jobs:
|
|||||||
if: needs.detect-provider.outputs.provider == 'github'
|
if: needs.detect-provider.outputs.provider == 'github'
|
||||||
uses: ./.github/workflows/github-release.yml
|
uses: ./.github/workflows/github-release.yml
|
||||||
secrets:
|
secrets:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
gitea-release:
|
gitea-release:
|
||||||
needs: detect-provider
|
needs: detect-provider
|
||||||
|
26
CHANGELOG.md
26
CHANGELOG.md
@ -1,5 +1,31 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.3.16] - 2025-02-21
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.16
|
||||||
|
- ci: update filenames for firmware and website binaries in release workflows
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.15] - 2025-02-21
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.15
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- ci: fix missing 'fi' in GitHub release workflow script
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.14] - 2025-02-21
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.14
|
||||||
|
- ci: update GitHub release workflow to improve file upload handling
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.13] - 2025-02-21
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.13
|
||||||
|
- ci: update GitHub release workflow to use RELEASE_TOKEN for improved security
|
||||||
|
|
||||||
|
|
||||||
## [1.3.12] - 2025-02-21
|
## [1.3.12] - 2025-02-21
|
||||||
### Changed
|
### Changed
|
||||||
- update webpages for version v1.3.12
|
- update webpages for version v1.3.12
|
||||||
|
@ -9,7 +9,9 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.3.12"
|
version = "1.3.16"
|
||||||
|
|
||||||
|
#test
|
||||||
|
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32
|
||||||
|
Reference in New Issue
Block a user