Compare commits
27 Commits
8ab16b351b
...
v1.3.75
Author | SHA1 | Date | |
---|---|---|---|
dfbb2fbd9b | |||
0302158449 | |||
68c385f9d7 | |||
9a8bd58cb3 | |||
0d8b8918c1 | |||
a892b854b5 | |||
0f02f6c848 | |||
96c054827e | |||
f93eedf775 | |||
68a10dfeb2 | |||
632b7a089e | |||
c0e3650bf4 | |||
8e3dfc93f7 | |||
5016285dce | |||
9b1a232fde | |||
37e79b7a49 | |||
6bd23f31c1 | |||
3099e9ded9 | |||
4952ad3150 | |||
2055da9962 | |||
459a31cad3 | |||
4b1930209b | |||
7dde07b5ab | |||
33a5406248 | |||
b016a31ff0 | |||
19bc4927e4 | |||
cd55cb86ba |
46
.github/workflows/gitea-release.yml
vendored
46
.github/workflows/gitea-release.yml
vendored
@ -6,6 +6,9 @@ on:
|
||||
GITEA_TOKEN:
|
||||
description: 'Token für Gitea API-Zugriff'
|
||||
required: true
|
||||
FTP_PASSWORD:
|
||||
description: 'FTP Password for firmware upload'
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
create-release:
|
||||
@ -71,45 +74,43 @@ jobs:
|
||||
- name: Generate Release Notes
|
||||
id: release_notes
|
||||
run: |
|
||||
# Get all tags sorted by version
|
||||
TAGS=($(git tag -l 'v*' --sort=-v:refname))
|
||||
CURRENT_TAG="${TAGS[0]}"
|
||||
# Get the latest tag
|
||||
LATEST_TAG=$(git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | sed -n '2p')
|
||||
|
||||
if [ ${#TAGS[@]} -gt 1 ]; then
|
||||
PREVIOUS_TAG="${TAGS[1]}"
|
||||
if [ -n "$LATEST_TAG" ]; then
|
||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||
echo "Changes since $PREVIOUS_TAG:" >> $GITHUB_OUTPUT
|
||||
echo "Changes since ${LATEST_TAG}:" >> $GITHUB_OUTPUT
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
|
||||
# Get commits between previous and current tag
|
||||
# Get all commits since last release with commit hash and author
|
||||
echo "### Added" >> $GITHUB_OUTPUT
|
||||
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
|
||||
git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - (feat|add|new)' | sed 's/^[a-f0-9]* - feat: /- /' >> $GITHUB_OUTPUT || true
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
|
||||
echo "### Fixed" >> $GITHUB_OUTPUT
|
||||
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
|
||||
git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - fix' | sed 's/^[a-f0-9]* - fix: /- /' >> $GITHUB_OUTPUT || true
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
|
||||
echo "### Changed" >> $GITHUB_OUTPUT
|
||||
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
|
||||
git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -ivE '^[a-f0-9]+ - (feat|fix|add|new)' | sed 's/^[a-f0-9]* - /- /' >> $GITHUB_OUTPUT || true
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
else
|
||||
# First release or no previous tag
|
||||
# First release
|
||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||
echo "Initial Release" >> $GITHUB_OUTPUT
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
|
||||
# Add all commits for initial release
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
echo "### Added" >> $GITHUB_OUTPUT
|
||||
git log --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
|
||||
git log --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - (feat|add|new)' | sed 's/^[a-f0-9]* - feat: /- /' >> $GITHUB_OUTPUT || true
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
|
||||
echo "### Fixed" >> $GITHUB_OUTPUT
|
||||
git log --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
|
||||
git log --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - fix' | sed 's/^[a-f0-9]* - fix: /- /' >> $GITHUB_OUTPUT || true
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
|
||||
echo "### Changed" >> $GITHUB_OUTPUT
|
||||
git log --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
|
||||
git log --pretty=format:"%h - %s (%an)" | grep -ivE '^[a-f0-9]+ - (feat|fix|add|new)' | sed 's/^[a-f0-9]* - /- /' >> $GITHUB_OUTPUT || true
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
@ -200,4 +201,17 @@ jobs:
|
||||
echo "Successfully uploaded $file"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
- name: Upload Firmware via FTP
|
||||
if: success()
|
||||
uses: sebastianpopp/ftp-action@releases/v2
|
||||
with:
|
||||
host: "filaman.app"
|
||||
port: 21
|
||||
user: ${{ secrets.FTP_USER }}
|
||||
password: ${{ secrets.FTP_PASSWORD }}
|
||||
forceSsl: true
|
||||
localDir: ".pio/build/esp32dev"
|
||||
remoteDir: "/"
|
||||
options: "set ftp:ssl-force true; set ftp:ssl-protect-data true; set ssl:verify-certificate no; set ftp:ssl-auth TLS; put filaman_full_*.bin -o filaman_full.bin"
|
28
.github/workflows/github-release.yml
vendored
28
.github/workflows/github-release.yml
vendored
@ -76,45 +76,43 @@ jobs:
|
||||
- name: Generate Release Notes
|
||||
id: release_notes
|
||||
run: |
|
||||
# Get all tags sorted by version
|
||||
TAGS=($(git tag -l 'v*' --sort=-v:refname))
|
||||
CURRENT_TAG="${TAGS[0]}"
|
||||
# Get the latest tag
|
||||
LATEST_TAG=$(git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | sed -n '2p')
|
||||
|
||||
if [ ${#TAGS[@]} -gt 1 ]; then
|
||||
PREVIOUS_TAG="${TAGS[1]}"
|
||||
if [ -n "$LATEST_TAG" ]; then
|
||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||
echo "Changes since $PREVIOUS_TAG:" >> $GITHUB_OUTPUT
|
||||
echo "Changes since ${LATEST_TAG}:" >> $GITHUB_OUTPUT
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
|
||||
# Get commits between previous and current tag
|
||||
# Get all commits since last release with commit hash and author
|
||||
echo "### Added" >> $GITHUB_OUTPUT
|
||||
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
|
||||
git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - (feat|add|new)' | sed 's/^[a-f0-9]* - feat: /- /' >> $GITHUB_OUTPUT || true
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
|
||||
echo "### Fixed" >> $GITHUB_OUTPUT
|
||||
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
|
||||
git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - fix' | sed 's/^[a-f0-9]* - fix: /- /' >> $GITHUB_OUTPUT || true
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
|
||||
echo "### Changed" >> $GITHUB_OUTPUT
|
||||
git log ${PREVIOUS_TAG}..${CURRENT_TAG} --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
|
||||
git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -ivE '^[a-f0-9]+ - (feat|fix|add|new)' | sed 's/^[a-f0-9]* - /- /' >> $GITHUB_OUTPUT || true
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
else
|
||||
# First release or no previous tag
|
||||
# First release
|
||||
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
|
||||
echo "Initial Release" >> $GITHUB_OUTPUT
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
|
||||
# Add all commits for initial release
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
echo "### Added" >> $GITHUB_OUTPUT
|
||||
git log --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
|
||||
git log --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - (feat|add|new)' | sed 's/^[a-f0-9]* - feat: /- /' >> $GITHUB_OUTPUT || true
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
|
||||
echo "### Fixed" >> $GITHUB_OUTPUT
|
||||
git log --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
|
||||
git log --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - fix' | sed 's/^[a-f0-9]* - fix: /- /' >> $GITHUB_OUTPUT || true
|
||||
echo "" >> $GITHUB_OUTPUT
|
||||
|
||||
echo "### Changed" >> $GITHUB_OUTPUT
|
||||
git log --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
|
||||
git log --pretty=format:"%h - %s (%an)" | grep -ivE '^[a-f0-9]+ - (feat|fix|add|new)' | sed 's/^[a-f0-9]* - /- /' >> $GITHUB_OUTPUT || true
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
|
66
CHANGELOG.md
66
CHANGELOG.md
@ -1,5 +1,71 @@
|
||||
# Changelog
|
||||
|
||||
## [1.3.75] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.75
|
||||
|
||||
### Fixed
|
||||
- update FTP user and enhance SSL options in gitea-release workflow
|
||||
|
||||
|
||||
## [1.3.74] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.74
|
||||
|
||||
### Fixed
|
||||
- update password syntax in gitea-release workflow
|
||||
|
||||
|
||||
## [1.3.73] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.73
|
||||
- update version to 1.3.72 in platformio.ini
|
||||
|
||||
|
||||
## [1.3.72] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.72
|
||||
|
||||
### Fixed
|
||||
- update FTP options for Gitea release workflow
|
||||
|
||||
|
||||
## [1.3.71] - 2025-02-23
|
||||
### Added
|
||||
- add FTP upload step for firmware in Gitea release workflow
|
||||
|
||||
### Changed
|
||||
- update webpages for version v1.3.71
|
||||
|
||||
|
||||
## [1.3.70] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.70
|
||||
|
||||
|
||||
## [1.3.69] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.69
|
||||
|
||||
### Fixed
|
||||
- update release note generation to use the second latest tag
|
||||
|
||||
|
||||
## [1.3.68] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.68
|
||||
|
||||
### Fixed
|
||||
- update release note generation to include commit hash and author
|
||||
- remove commented test line from platformio.ini
|
||||
|
||||
|
||||
## [1.3.67] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.67
|
||||
- ci: update release note generation to use the latest tag
|
||||
|
||||
|
||||
## [1.3.66] - 2025-02-23
|
||||
### Changed
|
||||
- update webpages for version v1.3.66
|
||||
|
@ -9,10 +9,8 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.3.66"
|
||||
|
||||
#test
|
||||
|
||||
version = "1.3.75"
|
||||
##
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
board = esp32dev
|
||||
|
Reference in New Issue
Block a user