docs: update changelog for version 1.3.23

.github/workflows/gitea-release.yml

@@ -34,10 +34,10 @@ jobs:
         pio run -t buildfs
         
         # 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
-        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
         (cd .pio/build/esp32dev && 
@@ -72,18 +72,69 @@ jobs:
         echo "EOF" >> $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 }}
       run: |
         VERSION=${{ steps.get_version.outputs.VERSION }}
         cd .pio/build/esp32dev
         
+        # Debug-Ausgaben
+        echo "Debug: Checking API URL..."
+        echo "GITEA_API_URL=${GITEA_API_URL}"
+        
         # Prepare files for upload
         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
             FILES="$FILES -a $file"
+            echo "Debug: Found file: $file"
           fi
         done
         
-        # Create release using git command
-        git tag -a "v${VERSION}" -m "Release ${VERSION}"
-        git push origin "v${VERSION}"
+        # Check if tag exists
+        if ! git rev-parse "v${VERSION}" >/dev/null 2>&1; then
+          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

.github/workflows/github-release.yml

@@ -2,14 +2,23 @@ name: GitHub Release
 
 on:
   workflow_call:
+    secrets:
+      RELEASE_TOKEN:
+        description: 'GitHub token for release creation'
+        required: true
+
+permissions:
+  contents: write
 
 jobs:
   create-release:
     runs-on: ubuntu-latest
-    #permissions:
-    #  contents: write
+    permissions:
+      contents: write
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
     
     - name: Set up Python
       uses: actions/setup-python@v4
@@ -58,10 +67,10 @@ jobs:
         pio run -t buildfs
         
         # 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
-        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)
         (cd .pio/build/esp32dev && 
@@ -97,22 +106,22 @@ jobs:
 
     - name: Create GitHub Release
       env:
-        GH_TOKEN: ${{ github.token }}
+        GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
       run: |
         VERSION=${{ steps.get_version.outputs.VERSION }}
+        cd .pio/build/esp32dev
         
         # Create release with available files
-        cd .pio/build/esp32dev
         FILES_TO_UPLOAD=""
         
         # Always add firmware
-        if [ -f "filaman_${VERSION}.bin" ]; then
-          FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_${VERSION}.bin"
+        if [ -f "update_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 "webpage_${VERSION}.bin" ]; then
-          FILES_TO_UPLOAD="$FILES_TO_UPLOAD webpage_${VERSION}.bin"
+        if [ -f "update_filaman_website_v${VERSION}.bin" ]; then
+          FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin"
         fi
         
         if [ -f "filaman_full_${VERSION}.bin" ]; then

.github/workflows/release.yml

@@ -5,6 +5,9 @@ on:
     tags:
       - 'v*'
 
+permissions:
+  contents: write
+
 jobs:
   detect-provider:
     runs-on: ubuntu-latest
@@ -23,8 +26,12 @@ jobs:
 
   github-release:
     needs: detect-provider
+    permissions:
+      contents: write
     if: needs.detect-provider.outputs.provider == 'github'
     uses: ./.github/workflows/github-release.yml
+    secrets:
+      RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   gitea-release:
     needs: detect-provider

CHANGELOG.md

@@ -1,5 +1,92 @@
 # 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
+### Changed
+- update webpages for version v1.3.17
+- ci: comment out git tag and push commands in gitea-release workflow
+
+
+## [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
+### Changed
+- update webpages for version v1.3.12
+- ci: enhance GitHub release workflow with token handling and file upload improvements
+
+
 ## [1.3.11] - 2025-02-21
 ### Changed
 - update webpages for version v1.3.11

platformio.ini

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

scripts/update_changelog.py

@@ -122,7 +122,29 @@ def update_changelog():
                 f.write(updated_content)
             push_changes(version)
         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__":
     update_changelog()