Compare commits

...

5 Commits

Author SHA1 Message Date
aef3ba77ba docs: update changelog for version 1.3.24
Some checks failed
Release Workflow / detect-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m33s
2025-02-21 22:59:00 +01:00
2592c3a497 docs: update webpages for version v1.3.24 2025-02-21 22:59:00 +01:00
a48c5dfef0 workflow: rename update files to upgrade in GitHub release workflow 2025-02-21 22:58:54 +01:00
00554d0b09 workflow: aktualisiere bestehende Einträge im Changelog für vorhandene Versionen 2025-02-21 22:58:38 +01:00
05a91cd8d8 workflow: improve Gitea release process with dynamic URL determination and debug outputs 2025-02-21 22:58:24 +01:00
5 changed files with 48 additions and 15 deletions

View File

@ -71,12 +71,35 @@ jobs:
echo "$CHANGELOG" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
- name: Determine Gitea URL
id: gitea_url
run: |
echo "Debug Environment:"
echo "GITHUB_SERVER_URL=${GITHUB_SERVER_URL:-not set}"
echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
echo "GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-not set}"
echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
# Set API URL based on environment
if [ -n "${GITEA_SERVER_URL}" ]; then
GITEA_API_URL="${GITEA_SERVER_URL}"
GITEA_REPO=$(echo "${GITEA_REPOSITORY}" | cut -d'/' -f2)
GITEA_OWNER=$(echo "${GITEA_REPOSITORY}" | cut -d'/' -f1)
else
echo "Error: Could not determine Gitea server URL"
exit 1
fi
echo "GITEA_API_URL=${GITEA_API_URL}" >> $GITHUB_OUTPUT
echo "GITEA_REPO=${GITEA_REPO}" >> $GITHUB_OUTPUT
echo "GITEA_OWNER=${GITEA_OWNER}" >> $GITHUB_OUTPUT
- 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 }}
GITEA_API_URL: ${{ steps.gitea_url.outputs.GITEA_API_URL }}
GITEA_REPO: ${{ steps.gitea_url.outputs.GITEA_REPO }}
GITEA_OWNER: ${{ steps.gitea_url.outputs.GITEA_OWNER }}
run: |
VERSION=${{ steps.get_version.outputs.VERSION }}
cd .pio/build/esp32dev

View File

@ -115,12 +115,12 @@ jobs:
FILES_TO_UPLOAD=""
# Always add firmware
if [ -f "update_filaman_firmware_v${VERSION}.bin" ]; then
if [ -f "upgrade_filaman_firmware_v${VERSION}.bin" ]; then
FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_firmware_v${VERSION}.bin"
fi
# Add SPIFFS and full binary only if they exist
if [ -f "update_filaman_website_v${VERSION}.bin" ]; then
if [ -f "upgrade_filaman_website_v${VERSION}.bin" ]; then
FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin"
fi

View File

@ -1,5 +1,15 @@
# Changelog
## [1.3.24] - 2025-02-21
### Changed
- update webpages for version v1.3.24
- workflow: rename update files to upgrade in GitHub release workflow
- workflow: aktualisiere bestehende Einträge im Changelog für vorhandene Versionen
### Fixed
- workflow: improve Gitea release process with dynamic URL determination and debug outputs
## [1.3.23] - 2025-02-21
### Changed
- update webpages for version v1.3.23

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "1.3.23"
version = "1.3.24"
#test

View File

@ -122,29 +122,29 @@ def update_changelog():
f.write(updated_content)
push_changes(version)
else:
# Version existiert bereits, füge neue Einträge unter der existierenden Version ein
# Version existiert bereits, aktualisiere die bestehenden Einträge
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()
version_start = version_match.start()
# Suche nach der nächsten Version
next_version_match = re.search(next_version_pattern, content[version_start:])
next_version_match = re.search(next_version_pattern, content[version_start + 1:])
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:]
# Ersetze den Inhalt zwischen aktueller und nächster Version
next_version_pos = version_start + 1 + next_version_match.start()
updated_content = content[:version_start] + changelog_entry + content[next_version_pos:]
else:
# Füge am Ende des Abschnitts ein
updated_content = content[:version_start] + "\n" + changelog_entry + content[version_start:]
# Wenn keine nächste Version existiert, ersetze bis zum Ende
updated_content = content[:version_start] + changelog_entry + "\n"
with open(changelog_path, 'w') as f:
f.write(updated_content)
push_changes(version)
print(f"Added new entries to existing version {version}")
print(f"Updated entries for version {version}")
if __name__ == "__main__":
update_changelog()