Compare commits
19 Commits
Author | SHA1 | Date | |
---|---|---|---|
7cf113eaff | |||
44d27adab2 | |||
e0a2dff5fe | |||
519a089684 | |||
ef053bb2b6 | |||
0a91c7b269 | |||
875d9d2b70 | |||
52840b9b0b | |||
da1fc7678f | |||
982bb5aa21 | |||
007737db13 | |||
17e5949201 | |||
6a57186091 | |||
babd3f47a0 | |||
5372fe10fe | |||
e0c9d90892 | |||
e5f5d1961b | |||
31a960fb9e | |||
3c2e75b77a |
57
.github/workflows/gitea-release.yml
vendored
57
.github/workflows/gitea-release.yml
vendored
@ -72,18 +72,69 @@ jobs:
|
|||||||
echo "EOF" >> $GITHUB_OUTPUT
|
echo "EOF" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Create Gitea Release
|
- name: Create Gitea Release
|
||||||
|
env:
|
||||||
|
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||||
|
GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
|
||||||
|
GITEA_REPO: ${{ secrets.GITEA_REPO }}
|
||||||
|
GITEA_OWNER: ${{ secrets.GITEA_OWNER }}
|
||||||
run: |
|
run: |
|
||||||
VERSION=${{ steps.get_version.outputs.VERSION }}
|
VERSION=${{ steps.get_version.outputs.VERSION }}
|
||||||
cd .pio/build/esp32dev
|
cd .pio/build/esp32dev
|
||||||
|
|
||||||
|
# Debug-Ausgaben
|
||||||
|
echo "Debug: Checking API URL..."
|
||||||
|
echo "GITEA_API_URL=${GITEA_API_URL}"
|
||||||
|
|
||||||
# Prepare files for upload
|
# Prepare files for upload
|
||||||
FILES=""
|
FILES=""
|
||||||
for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${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"
|
||||||
|
echo "Debug: Found file: $file"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
# Create release using git command
|
# Check if tag exists
|
||||||
#git tag -a "v${VERSION}" -m "Release ${VERSION}"
|
if ! git rev-parse "v${VERSION}" >/dev/null 2>&1; then
|
||||||
#git push origin "v${VERSION}"
|
echo "Debug: Creating new tag v${VERSION}"
|
||||||
|
git tag -a "v${VERSION}" -m "Release ${VERSION}"
|
||||||
|
git push origin "v${VERSION}"
|
||||||
|
else
|
||||||
|
echo "Debug: Tag v${VERSION} already exists"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Test API connection
|
||||||
|
echo "Debug: Testing API connection..."
|
||||||
|
TEST_RESPONSE=$(curl -s -w "\n%{http_code}" -H "Authorization: token ${GITEA_TOKEN}" "${GITEA_API_URL}/api/v1/version")
|
||||||
|
TEST_STATUS=$(echo "$TEST_RESPONSE" | tail -n1)
|
||||||
|
if [ "$TEST_STATUS" != "200" ]; then
|
||||||
|
echo "Error: Cannot connect to Gitea API"
|
||||||
|
echo "Response: $TEST_RESPONSE"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create Gitea release using API
|
||||||
|
echo "Debug: Creating release..."
|
||||||
|
RELEASE_DATA="{
|
||||||
|
\"tag_name\": \"v${VERSION}\",
|
||||||
|
\"name\": \"v${VERSION}\",
|
||||||
|
\"body\": \"${{ steps.changelog.outputs.CHANGES }}\"
|
||||||
|
}"
|
||||||
|
|
||||||
|
# Create release and capture HTTP status
|
||||||
|
RESPONSE=$(curl -v -s -w "\n%{http_code}" -X POST \
|
||||||
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "$RELEASE_DATA" \
|
||||||
|
"${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases")
|
||||||
|
|
||||||
|
HTTP_STATUS=$(echo "$RESPONSE" | tail -n1)
|
||||||
|
RESPONSE_BODY=$(echo "$RESPONSE" | head -n -1)
|
||||||
|
|
||||||
|
echo "Debug: HTTP Status: $HTTP_STATUS"
|
||||||
|
echo "Debug: Response Body: $RESPONSE_BODY"
|
||||||
|
|
||||||
|
if [ "$HTTP_STATUS" != "201" ]; then
|
||||||
|
echo "Fehler beim Erstellen des Releases: $RESPONSE_BODY"
|
||||||
|
exit 1
|
||||||
|
fi
|
49
CHANGELOG.md
49
CHANGELOG.md
@ -1,5 +1,54 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.3.23] - 2025-02-21
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.23
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- workflow: enhance Gitea release process with debug outputs and API connection checks
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.22] - 2025-02-21
|
||||||
|
### Added
|
||||||
|
- workflow: improve Gitea release process with additional environment variables and error handling
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.22
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.21] - 2025-02-21
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.21
|
||||||
|
- workflow: enhance Gitea release process with API integration and token management
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.20] - 2025-02-21
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.20
|
||||||
|
- workflow: enable git tagging and pushing for Gitea releases
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.19] - 2025-02-21
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.19
|
||||||
|
- workflow: enable git push for version tagging in Gitea release
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.18] - 2025-02-21
|
||||||
|
### Changed
|
||||||
|
- ACHTUNG: Installiere einmal das filaman_full.bin danach kannst du über die upgrade Files aktualisieren und deine Settings bleiben auch erhalten.
|
||||||
|
- ATTENTION: Install the filaman_full.bin once, then you can update via the upgrade files and your settings will also be retained.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## [1.3.18] - 2025-02-21
|
||||||
|
### Added
|
||||||
|
- add note about filaman_full.bin installation in changelog
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.18
|
||||||
|
- update changelog for version 1.3.18 and enhance update script for existing entries
|
||||||
|
|
||||||
## [1.3.17] - 2025-02-21
|
## [1.3.17] - 2025-02-21
|
||||||
### Changed
|
### Changed
|
||||||
- update webpages for version v1.3.17
|
- update webpages for version v1.3.17
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.3.17"
|
version = "1.3.23"
|
||||||
|
|
||||||
#test
|
#test
|
||||||
|
|
||||||
|
@ -122,7 +122,29 @@ def update_changelog():
|
|||||||
f.write(updated_content)
|
f.write(updated_content)
|
||||||
push_changes(version)
|
push_changes(version)
|
||||||
else:
|
else:
|
||||||
print(f"Version {version} already exists in changelog")
|
# Version existiert bereits, füge neue Einträge unter der existierenden Version ein
|
||||||
|
version_pattern = f"## \\[{version}\\] - \\d{{4}}-\\d{{2}}-\\d{{2}}"
|
||||||
|
next_version_pattern = "## \\[.*?\\] - \\d{4}-\\d{2}-\\d{2}"
|
||||||
|
|
||||||
|
# Finde den Start der aktuellen Version
|
||||||
|
version_match = re.search(version_pattern, content)
|
||||||
|
if version_match:
|
||||||
|
version_start = version_match.end()
|
||||||
|
# Suche nach der nächsten Version
|
||||||
|
next_version_match = re.search(next_version_pattern, content[version_start:])
|
||||||
|
|
||||||
|
if next_version_match:
|
||||||
|
# Füge zwischen aktueller und nächster Version ein
|
||||||
|
insert_pos = version_start + next_version_match.start()
|
||||||
|
updated_content = content[:insert_pos] + "\n" + changelog_entry + content[insert_pos:]
|
||||||
|
else:
|
||||||
|
# Füge am Ende des Abschnitts ein
|
||||||
|
updated_content = content[:version_start] + "\n" + changelog_entry + content[version_start:]
|
||||||
|
|
||||||
|
with open(changelog_path, 'w') as f:
|
||||||
|
f.write(updated_content)
|
||||||
|
push_changes(version)
|
||||||
|
print(f"Added new entries to existing version {version}")
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
update_changelog()
|
update_changelog()
|
Reference in New Issue
Block a user