docs: update changelog for version 1.2.60

.github/workflows/providers/gitea-release.yml

@@ -1,42 +1,61 @@
 name: Gitea Release
 
 on:
-  workflow_call:  # This workflow will only be triggered when called by another workflow
+  workflow_call:
-
+    inputs:
-permissions:
+      gitea_ref_name:
-  contents: write      # Required for creating releases
+        description: 'Gitea ref name'
-  issues: read        # Required for reading changelog
+        required: true
-  pull-requests: read # Required for reading changelog
+        type: string
+      gitea_server_url:
+        description: 'Gitea server URL'
+        required: true
+        type: string
+      gitea_repository:
+        description: 'Gitea repository'
+        required: true
+        type: string
+    secrets:
+      GITEA_TOKEN:
+        required: true
 
 jobs:
-  build:
+  create-release:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout Repository
+      uses: actions/checkout@v4
 
-    - name: Set up Python
+    - name: Install System Dependencies
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-    
-    - name: Install PlatformIO
       run: |
-        python -m pip install --upgrade pip
+        sudo apt-get update
-        pip install --upgrade platformio
+        sudo apt-get install -y python3 python3-venv build-essential curl git
+
+    - name: Set up Python Virtual Environment
+      run: |
+        python3 -m venv venv
+        source venv/bin/activate
+        pip install --upgrade pip
+        pip install platformio esptool
+        
+        echo "Verifying installations:"
+        platformio --version
+        python3 --version
+        esptool.py version
 
     - name: Build Firmware
       run: |
-        pio run -t buildfs  # Build SPIFFS
+        source venv/bin/activate
-        pio run            # Build firmware
+        echo "Building SPIFFS..."
+        platformio run -t buildfs
         
-    - name: Install esptool
+        echo "Building firmware..."
-      run: |
+        platformio run
-        pip install esptool
 
-    - name: Merge firmware and SPIFFS
+    - name: Create Release Files
       run: |
+        source venv/bin/activate
+        echo "Creating release files..."
         esptool.py --chip esp32 merge_bin \
           --flash_mode dio \
           --flash_freq 40m \
@@ -45,57 +64,71 @@ jobs:
           0x1000 .pio/build/esp32dev/bootloader.bin \
           0x8000 .pio/build/esp32dev/partitions.bin \
           0x10000 .pio/build/esp32dev/firmware.bin \
-          0x290000 .pio/build/esp32dev/spiffs.bin
+          0x3D0000 .pio/build/esp32dev/spiffs.bin
         
-    - name: Prepare OTA firmware
-      run: |
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
 
-    - name: Get version from tag
-      id: get_version
-      run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-      
     - name: Read CHANGELOG.md
       id: changelog
       run: |
-        CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^v//')
+        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/ {p=0} p" CHANGELOG.md)
         echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
         echo "$CHANGELOG" >> $GITHUB_OUTPUT
         echo "EOF" >> $GITHUB_OUTPUT
+        echo "CHANGELOG CONTENT:"
+        echo "$CHANGELOG"
+        if [ -z "$CHANGELOG" ]; then
+          echo "No changelog found for version $VERSION"
+          exit 1
+        fi
 
     - name: Create Release
       env:
-        GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+        TOKEN: ${{ secrets.GITEA_TOKEN }}
-        GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
+        GITEA_REF_NAME: ${{ inputs.gitea_ref_name }}
-        GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
+        GITEA_SERVER_URL: ${{ inputs.gitea_server_url }}
+        GITEA_REPOSITORY: ${{ inputs.gitea_repository }}
+        CHANGELOG: ${{ steps.changelog.outputs.CHANGES }}
       run: |
-        # Create release using Gitea API
+        echo "Debug environment:"
-        RESPONSE=$(curl -X POST \
+        echo "GITEA_REF_NAME: ${GITEA_REF_NAME}"
-        -H "Authorization: token ${GITEA_TOKEN}" \
+        echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}"
-        -H "Content-Type: application/json" \
+        echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
-        -H "accept: application/json" \
+        echo "CHANGELOG: ${CHANGELOG}"
-        "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
-        -d '{
-            "tag_name": "${{ github.ref_name }}",
-            "name": "Release ${{ steps.get_version.outputs.VERSION }}",
-            "body": "${{ steps.changelog.outputs.CHANGES }}",
-            "draft": false,
-            "prerelease": false
-        }')
         
-        # Extract release ID from response
+        TAG="${GITEA_REF_NAME}"
-        RELEASE_ID=$(echo $RESPONSE | jq -r .id)
+        API_URL="${GITEA_SERVER_URL}/api/v1"
+        REPO="${GITEA_REPOSITORY}"
         
-        # Upload full firmware
+        echo "Creating release for ${TAG} on ${REPO}..."
-        curl -X POST \
-        -H "Authorization: token ${GITEA_TOKEN}" \
-        -H "Content-Type: application/octet-stream" \
-        "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_full.bin" \
-        --data-binary @.pio/build/esp32dev/filaman_full.bin
         
-        # Upload OTA firmware
+        # Create release
-        curl -X POST \
+        RESPONSE=$(curl -k -s \
-        -H "Authorization: token ${GITEA_TOKEN}" \
+          -X POST \
-        -H "Content-Type: application/octet-stream" \
+          -H "Authorization: token ${TOKEN}" \
-        "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_ota.bin" \
+          -H "Content-Type: application/json" \
-        --data-binary @.pio/build/esp32dev/filaman_ota.bin
+          -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\",\"body\":\"${CHANGELOG}\"}" \
+          "${API_URL}/repos/${REPO}/releases")
+        
+        RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
+        UPLOAD_URL=$(echo "$RESPONSE" | grep -o '"upload_url":"[^"]*' | cut -d':' -f2- | tr -d '"')
+        
+        if [ -n "$RELEASE_ID" ]; then
+          echo "Release created with ID: $RELEASE_ID"
+          
+          # Upload files
+          for file in "filaman_full.bin" "filaman_ota.bin"; do
+            echo "Uploading $file..."
+            curl -k -s \
+              -X POST \
+              -H "Authorization: token ${TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary "@.pio/build/esp32dev/$file" \
+              "${UPLOAD_URL}?name=$file"
+          done
+        else
+          echo "Failed to create release. Response:"
+          echo "$RESPONSE"
+          exit 1
+        fi

.github/workflows/providers/github-release.yml

@@ -1,18 +1,13 @@
 name: GitHub Release
 
 on:
-  workflow_call:  # This workflow will only be triggered when called by another workflow
+  workflow_call:
-
-permissions:
-  contents: write      # Required for creating releases
-  issues: read        # Required for reading changelog
-  pull-requests: read # Required for reading changelog
 
 jobs:
-  build:
+  create-release:
     runs-on: ubuntu-latest
     permissions:
-      contents: write # Required for creating releases at job level
+      contents: write
     steps:
     - uses: actions/checkout@v4
     
@@ -45,39 +40,32 @@ jobs:
           0x1000 .pio/build/esp32dev/bootloader.bin \
           0x8000 .pio/build/esp32dev/partitions.bin \
           0x10000 .pio/build/esp32dev/firmware.bin \
-          0x290000 .pio/build/esp32dev/spiffs.bin
+          0x3D0000 .pio/build/esp32dev/spiffs.bin
 
     - name: Prepare OTA firmware
       run: |
-        # Use PlatformIO to create a proper OTA image
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
     
     - name: Get version from tag
       id: get_version
-      run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+      run: |
+        echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
       
     - name: Read CHANGELOG.md
       id: changelog
       run: |
-        CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
         echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
         echo "$CHANGELOG" >> $GITHUB_OUTPUT
         echo "EOF" >> $GITHUB_OUTPUT
 
-    - name: Install and Configure GitHub CLI
+    - name: Create GitHub Release
-      run: |
-        curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
-        && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
-        && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
-        && sudo apt update \
-        && sudo apt install gh -y
-        
-    - name: Create Release with GitHub CLI
       env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GH_TOKEN: ${{ github.token }}
       run: |
         gh release create "${{ github.ref_name }}" \
           --title "Release ${{ steps.get_version.outputs.VERSION }}" \
           --notes "${{ steps.changelog.outputs.CHANGES }}" \
-          ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
+          .pio/build/esp32dev/filaman_full.bin \
-          ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
+          .pio/build/esp32dev/filaman_ota.bin

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: Release Workflow
 
 on:
   push:
@@ -6,320 +6,65 @@ on:
       - 'v*'
 
 jobs:
-  release:
+  route:
+    runs-on: ubuntu-latest
+    outputs:
+      provider: ${{ steps.provider.outputs.provider }}
+      gitea_ref_name: ${{ steps.provider.outputs.gitea_ref_name }}
+      gitea_server_url: ${{ steps.provider.outputs.gitea_server_url }}
+      gitea_repository: ${{ steps.provider.outputs.gitea_repository }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Debug Environment
+        run: |
+          echo "CI Environment Details:"
+          echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}"
+          echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}"
+          echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
+          echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
+          echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
+
+      - name: Determine CI Provider
+        id: provider
+        shell: bash
+        run: |
+          if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
+            echo "provider=gitea" >> "$GITHUB_OUTPUT"
+            echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
+            echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT"
+            echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
+          elif [ "${GITHUB_ACTIONS}" = "true" ]; then
+            echo "provider=github" >> "$GITHUB_OUTPUT"
+          else
+            echo "provider=unknown" >> "$GITHUB_OUTPUT"
+          fi
+
+  verify-provider:
+    needs: route
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Echo detected provider
-      
-      - name: Verify Gitea API Connection
-        if: github.server_url != 'https://github.com'
-        env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
         run: |
-          # Sanitize URL
+          echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
-          GITEA_BASE_URL=$(echo "$GITEA_API_URL" | sed 's#/\+$##' | sed 's#/api/v1$##')
+          if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
-          GITEA_API_ENDPOINT="${GITEA_BASE_URL}/api/v1"
+            echo "::error::Failed to detect CI provider!"
-          
-          echo "Testing connection to Gitea API..."
-          echo "API Endpoint: ${GITEA_API_ENDPOINT}"
-          
-          # Try to get Gitea version
-          RESPONSE=$(curl -sSf -w "\nHTTP_STATUS:%{http_code}" \
-            -H "Authorization: token ${GITEA_TOKEN}" \
-            "${GITEA_API_ENDPOINT}/version")
-          
-          HTTP_STATUS=$(echo "$RESPONSE" | grep "HTTP_STATUS:" | cut -d":" -f2)
-          API_RESPONSE=$(echo "$RESPONSE" | grep -v "HTTP_STATUS:")
-          
-          echo "HTTP Status: ${HTTP_STATUS}"
-          echo "API Response: ${API_RESPONSE}"
-          
-          if [ "$HTTP_STATUS" != "200" ]; then
-            echo "Error: Could not connect to Gitea API"
             exit 1
           fi
 
-          echo "Gitea API connection successful"
+  github-release:
+    needs: [route, verify-provider]
+    if: needs.route.outputs.provider == 'github'
+    uses: ./.github/workflows/providers/github-release.yml
 
-      - name: Parse and validate Gitea URL
+  gitea-release:
-        if: github.server_url != 'https://github.com'
+    needs: [route, verify-provider]
-        env:
+    if: needs.route.outputs.provider == 'gitea'
-          GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
+    uses: ./.github/workflows/providers/gitea-release.yml
-        run: |
+    with:
-          validate_url() {
+      gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }}
-            local url="$1"
+      gitea_server_url: ${{ needs.route.outputs.gitea_server_url }}
-            # Check if URL starts with protocol
+      gitea_repository: ${{ needs.route.outputs.gitea_repository }}
-            if [[ ! "$url" =~ ^https?:// ]]; then
+    secrets:
-              echo "Error: URL must start with http:// or https://"
+      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-              return 1
-            fi
-            
-            # Extract host part
-            local host=$(echo "$url" | sed -E 's#^https?://##' | cut -d'/' -f1)
-            if [ -z "$host" ]; then
-              echo "Error: No host found in URL"
-              return 1
-            fi
-            
-            # Validate host format (domain or IP)
-            if [[ ! "$host" =~ ^[a-zA-Z0-9.-]+$ ]]; then
-              echo "Error: Invalid host format"
-              return 1
-            fi
-            
-            echo "URL validation passed"
-            return 0
-          }
-          
-          echo "Validating Gitea API URL: $GITEA_API_URL"
-          if ! validate_url "$GITEA_API_URL"; then
-            exit 1
-          fi
-          
-          # Store validated base URL for later use
-          GITEA_BASE_URL=$(echo "$GITEA_API_URL" | sed 's#/\+$##' | sed 's#/api/v1$##')
-          echo "GITEA_BASE_URL=$GITEA_BASE_URL" >> $GITHUB_ENV
-          
-          # Test URL resolution
-          echo "Testing DNS resolution..."
-          host=$(echo "$GITEA_BASE_URL" | sed -E 's#^https?://##' | cut -d'/' -f1)
-          if ! ping -c 1 "$host" > /dev/null 2>&1; then
-            echo "Warning: Could not ping host (this might be normal if ICMP is blocked)"
-          fi
-          
-          # Test HTTPS connection
-          echo "Testing HTTPS connection..."
-          if ! curl -sSf -o /dev/null "$GITEA_BASE_URL"; then
-            echo "Error: Could not establish HTTPS connection to $GITEA_BASE_URL"
-            exit 1
-          fi
-          
-          echo "URL validation and connection test passed"
-      
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-    
-      - name: Install PlatformIO
-        run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade platformio
-    
-      - name: Build Firmware
-        run: |
-          pio run -t buildfs  # Build SPIFFS
-          pio run            # Build firmware
-        
-      - name: Install esptool
-        run: |
-          pip install esptool
-        
-      - name: Merge firmware and SPIFFS
-        run: |
-          esptool.py --chip esp32 merge_bin \
-            --flash_mode dio \
-            --flash_freq 40m \
-            --flash_size 4MB \
-            -o .pio/build/esp32dev/filaman_full.bin \
-            0x1000 .pio/build/esp32dev/bootloader.bin \
-            0x8000 .pio/build/esp32dev/partitions.bin \
-            0x10000 .pio/build/esp32dev/firmware.bin \
-            0x290000 .pio/build/esp32dev/spiffs.bin
-
-      - name: Prepare OTA firmware
-        run: |
-          cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-      
-      - name: Get version from tag
-        id: get_version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-      
-      - name: Read CHANGELOG.md
-        id: changelog
-        run: |
-          CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
-          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
-          echo "$CHANGELOG" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
-      - name: Install jq
-        if: ${{ github.server_url != 'https://github.com' }}
-        run: sudo apt-get install -y jq
-
-      - name: Debug Environment Variables
-        run: |
-          echo "GITHUB_SERVER_URL: $GITHUB_SERVER_URL"
-          if [ -n "$GITEA_TOKEN" ]; then
-            echo "GITEA_TOKEN is set"
-          else
-            echo "GITEA_TOKEN is not set"
-          fi
-          if [ -n "${{ secrets.GITEA_API_URL }}" ]; then
-            echo "GITEA_API_URL from secrets: ${{ secrets.GITEA_API_URL }}"
-          else
-            echo "GITEA_API_URL is not set in secrets"
-          fi
-          if [ -n "${{ secrets.GITEA_REPOSITORY }}" ]; then
-            echo "GITEA_REPOSITORY from secrets: ${{ secrets.GITEA_REPOSITORY }}"
-          else
-            echo "GITEA_REPOSITORY is not set in secrets"
-          fi
-
-      - name: Validate Gitea Configuration
-        if: github.server_url != 'https://github.com'
-        run: |
-          if [ -z "${{ secrets.GITEA_API_URL }}" ]; then
-            echo "::error::GITEA_API_URL is not configured in repository secrets"
-            exit 1
-          fi
-          
-          if [ -z "${{ secrets.GITEA_TOKEN }}" ]; then
-            echo "::error::GITEA_TOKEN is not configured in repository secrets"
-            exit 1
-          fi
-          
-          if [ -z "${{ secrets.GITEA_REPOSITORY }}" ]; then
-            echo "::error::GITEA_REPOSITORY is not configured in repository secrets"
-            exit 1
-          fi
-          
-          # Validate URL format
-          if [[ ! "${{ secrets.GITEA_API_URL }}" =~ ^https?:// ]]; then
-            echo "::error::GITEA_API_URL must start with http:// or https://"
-            exit 1
-          fi
-          
-          echo "Gitea configuration is valid"
-
-      - name: Determine and run release process
-        env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
-          GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          if [[ "$GITHUB_SERVER_URL" == "https://github.com" ]]; then
-            echo "Creating GitHub Release..."
-            curl -X POST \
-              -H "Authorization: token ${GITHUB_TOKEN}" \
-              -H "Accept: application/vnd.github.v3+json" \
-              https://api.github.com/repos/${{ github.repository }}/releases \
-              -d '{
-                "tag_name": "${{ github.ref_name }}",
-                "name": "Release ${{ steps.get_version.outputs.VERSION }}",
-                "body": "${{ steps.changelog.outputs.CHANGES }}",
-                "draft": false,
-                "prerelease": false
-              }' > release.json
-            
-            UPLOAD_URL=$(jq -r .upload_url release.json | sed 's/{?name,label}//')
-            
-            # Upload full firmware
-            curl -X POST \
-              -H "Authorization: token ${GITHUB_TOKEN}" \
-              -H "Content-Type: application/octet-stream" \
-              "${UPLOAD_URL}?name=filaman_full.bin" \
-              --data-binary @.pio/build/esp32dev/filaman_full.bin
-            
-            # Upload OTA firmware
-            curl -X POST \
-              -H "Authorization: token ${GITHUB_TOKEN}" \
-              -H "Content-Type: application/octet-stream" \
-              "${UPLOAD_URL}?name=filaman_ota.bin" \
-              --data-binary @.pio/build/esp32dev/filaman_ota.bin
-          else
-            echo "Creating Gitea Release..."
-            
-            # Validate and sanitize inputs
-            if [ -z "$GITEA_TOKEN" ] || [ -z "$GITEA_API_URL" ] || [ -z "$GITEA_REPOSITORY" ]; then
-              echo "Error: Missing required Gitea configuration"
-              exit 1
-            fi
-            
-            # Remove trailing slash and /api/v1 if present
-            GITEA_BASE_URL=$(echo "$GITEA_API_URL" | sed 's#/\+$##' | sed 's#/api/v1$##')
-            
-            # Construct proper API URL
-            GITEA_API_ENDPOINT="${GITEA_BASE_URL}/api/v1"
-            
-            echo "Debug: URL Components"
-            echo "GITEA_BASE_URL: ${GITEA_BASE_URL}"
-            echo "GITEA_API_ENDPOINT: ${GITEA_API_ENDPOINT}"
-            echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
-            
-            # Test API connection with verbose output
-            echo "Testing API connection..."
-            curl -v "${GITEA_API_ENDPOINT}/version" 2>&1 | tee api_test.log
-            if [ ${PIPESTATUS[0]} -ne 0 ]; then
-              echo "Error: Could not connect to Gitea API"
-              echo "API Test Log:"
-              cat api_test.log
-              exit 1
-            fi
-            
-            # Prepare release data
-            RELEASE_DATA=$(cat << EOF
-{
-  "tag_name": "${{ github.ref_name }}",
-  "name": "Release ${{ steps.get_version.outputs.VERSION }}",
-  "body": $(echo "${{ steps.changelog.outputs.CHANGES }}" | jq -R -s .),
-  "draft": false,
-  "prerelease": false
-}
-EOF
-)
-            
-            echo "Debug: Release Payload"
-            echo "$RELEASE_DATA" | jq .
-            
-            # Create release with full debug output
-            echo "Creating release at ${GITEA_API_ENDPOINT}/repos/${GITEA_REPOSITORY}/releases"
-            RESPONSE=$(curl -v -X POST \
-              -H "Authorization: token ${GITEA_TOKEN}" \
-              -H "Content-Type: application/json" \
-              -H "Accept: application/json" \
-              "${GITEA_API_ENDPOINT}/repos/${GITEA_REPOSITORY}/releases" \
-              -d "$RELEASE_DATA" 2>&1 | tee release_creation.log)
-            
-            if [ ${PIPESTATUS[0]} -ne 0 ]; then
-              echo "Error: Failed to create release"
-              echo "Release Creation Log:"
-              cat release_creation.log
-              exit 1
-            fi
-            
-            # Extract and validate release ID
-            RELEASE_ID=$(echo "$RESPONSE" | jq -r .id)
-            if [ -z "$RELEASE_ID" ] || [ "$RELEASE_ID" = "null" ]; then
-              echo "Error: Failed to get release ID"
-              echo "API Response:"
-              echo "$RESPONSE" | jq .
-              echo "Full Response Log:"
-              cat release_creation.log
-              exit 1
-            fi
-            
-            # Upload assets with debug output
-            for asset in "filaman_full.bin" "filaman_ota.bin"; do
-              echo "Uploading ${asset}..."
-              ASSET_URL="${GITEA_API_ENDPOINT}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=${asset}"
-              echo "Debug: Uploading to ${ASSET_URL}"
-              
-              curl -v -X POST \
-                -H "Authorization: token ${GITEA_TOKEN}" \
-                -H "Content-Type: application/octet-stream" \
-                "${ASSET_URL}" \
-                --data-binary "@.pio/build/esp32dev/${asset}" 2>&1 | tee "upload_${asset}.log"
-              
-              if [ ${PIPESTATUS[0]} -ne 0 ]; then
-                echo "Error: Failed to upload ${asset}"
-                echo "Upload Log:"
-                cat "upload_${asset}.log"
-                exit 1
-              fi
-            done
-            
-            echo "Release process completed successfully"
-          fi

CHANGELOG.md

@@ -1,5 +1,267 @@
 # Changelog
 
+## [1.2.60] - 2025-02-20
+### Added
+- update version to 1.2.60 in platformio configuration
+
+### Changed
+- update webpages for version 1.2.60
+
+
+## [1.2.59] - 2025-02-20
+### Added
+- update version to 1.2.59 and enhance OTA upload handling
+
+### Changed
+- update webpages for version 1.2.59
+
+
+## [1.2.58] - 2025-02-20
+### Added
+- update version to 1.2.58 in HTML files and platformio configuration
+
+
+## [1.2.57] - 2025-02-20
+### Added
+- update version to 1.2.57 in platformio configuration
+
+### Fixed
+- update spiffs offset and sizes in firmware and partitions configuration
+
+
+## [1.2.56] - 2025-02-19
+### Added
+- update version to 1.2.56 and adjust firmware and partition settings
+
+### Changed
+- remove redundant comment from Gitea release workflow
+
+
+## [1.2.55] - 2025-02-19
+### Added
+- update version to 1.2.55 and adjust Gitea release workflow to remove 'v' prefix from version
+
+
+## [1.2.54] - 2025-02-19
+### Added
+- update version to 1.2.54 and add check for missing changelog in Gitea release workflow
+
+
+## [1.2.53] - 2025-02-19
+### Added
+- update version to 1.2.53 and enhance Gitea release workflow to handle missing changelog
+
+
+## [1.2.52] - 2025-02-19
+### Added
+- update version to 1.2.52 and improve Gitea release workflow output handling
+
+
+## [1.2.51] - 2025-02-19
+### Added
+- update version to 1.2.51 and add debug output in Gitea release workflow
+
+
+## [1.2.50] - 2025-02-19
+### Added
+- update version to 1.2.50 and remove obsolete build workflow
+
+
+## [1.2.49] - 2025-02-19
+### Added
+- update version to 1.2.49 and modify changelog reading in Gitea release workflow
+
+
+## [1.2.48] - 2025-02-19
+### Added
+- update version to 1.2.48 and modify changelog reading in release workflows
+
+
+## [1.2.47] - 2025-02-19
+### Added
+- update version to 1.2.47 and modify changelog reading in GitHub release workflow
+
+
+## [1.2.46] - 2025-02-19
+### Added
+- update Gitea release workflow to include changelog and increment version to 1.2.46
+
+
+## [1.2.45] - 2025-02-19
+### Added
+- update Gitea release workflow to use dynamic upload URL and increment version to 1.2.45
+
+
+## [1.2.44] - 2025-02-19
+### Added
+- update Gitea release workflow to include additional outputs and increment version to 1.2.44
+
+
+## [1.2.43] - 2025-02-19
+### Added
+- update Gitea release workflow by removing unnecessary outputs and increment version to 1.2.43
+
+
+## [1.2.42] - 2025-02-19
+### Added
+- update Gitea release workflow to include additional outputs and increment version to 1.2.42
+
+
+## [1.2.41] - 2025-02-19
+### Added
+- update Gitea release workflow debug output and increment version to 1.2.41
+
+
+## [1.2.40] - 2025-02-19
+### Added
+- add inputs for Gitea release workflow and increment version to 1.2.40
+
+
+## [1.2.39] - 2025-02-19
+### Added
+- update Gitea release workflow to use Python virtual environment and increment version to 1.2.39
+
+
+## [1.2.38] - 2025-02-19
+### Added
+- update Gitea release workflow and increment version to 1.2.38
+
+
+## [1.2.37] - 2025-02-19
+### Added
+- update Gitea release workflow and increment version to 1.2.37
+
+
+## [1.2.36] - 2025-02-19
+### Added
+- update Gitea release workflow and increment version to 1.2.36
+
+
+## [1.2.35] - 2025-02-19
+### Added
+- update Gitea release workflow and version to 1.2.35
+
+
+## [1.2.34] - 2025-02-19
+### Added
+- update version to 1.2.34 and enhance Gitea and GitHub release workflows
+
+
+## [1.2.33] - 2025-02-19
+### Added
+- update version to 1.2.33 and refactor release workflows for Gitea and GitHub
+
+
+## [1.2.32] - 2025-02-19
+### Added
+- update version to 1.2.32 and adjust workflow dependencies for GitHub and Gitea releases
+
+
+## [1.2.31] - 2025-02-19
+### Added
+- update version to 1.2.31
+
+
+## [1.2.30] - 2025-02-19
+### Added
+- update version to 1.2.30 and enhance release workflows for Gitea and GitHub with improved artifact handling and changelog integration
+
+
+## [1.2.29] - 2025-02-19
+### Added
+- update version to 1.2.29 and enhance Gitea release workflow with improved error handling and debugging
+
+
+## [1.2.28] - 2025-02-19
+### Added
+- add build and release workflows for Gitea and GitHub, increment version to 1.2.28
+
+
+## [1.2.27] - 2025-02-19
+### Added
+- enhance CI workflows with provider detection and update version to 1.2.27
+
+
+## [1.2.26] - 2025-02-19
+### Added
+- update release workflows for Gitea and GitHub, increment version to 1.2.26
+
+
+## [1.2.25] - 2025-02-19
+### Added
+- update GitHub release workflows and increment version to 1.2.25
+
+
+## [1.2.24] - 2025-02-19
+### Added
+- update GitHub release workflow and increment version to 1.2.24
+
+
+## [1.2.23] - 2025-02-19
+### Added
+- update Gitea release workflow and increment version to 1.2.23
+
+
+## [1.2.22] - 2025-02-19
+### Added
+- update Gitea runner configuration and increment version to 1.2.22
+
+
+## [1.2.21] - 2025-02-19
+### Added
+- update Gitea release condition and increment version to 1.2.21
+
+
+## [1.2.20] - 2025-02-19
+### Added
+- update release workflows for GitHub and Gitea, increment version to 1.2.20
+
+
+## [1.2.19] - 2025-02-19
+### Added
+- add Gitea and GitHub release workflows for version 1.2.19
+
+
+## [1.2.18] - 2025-02-19
+### Added
+- remove Gitea and GitHub release workflows and increment version to 1.2.18
+
+
+## [1.2.17] - 2025-02-19
+### Added
+- update Gitea release workflow for version 1.2.17 and improve job structure
+
+
+## [1.2.16] - 2025-02-19
+### Added
+- update Gitea release workflow and increment version to 1.2.16
+
+
+## [1.2.15] - 2025-02-19
+### Added
+- update version to 1.2.15 and clean up Gitea release workflow
+
+
+## [1.2.14] - 2025-02-19
+### Added
+- update version to 1.2.14 and refactor release workflows for improved GitHub and Gitea support
+
+
+## [1.2.13] - 2025-02-19
+### Added
+- update version to 1.2.13 and enhance release workflow with Python setup and Gitea support
+
+
+## [1.2.12] - 2025-02-19
+### Added
+- update version to 1.2.12 and refactor release workflows for improved provider detection and execution
+
+
+## [1.2.11] - 2025-02-18
+### Added
+- update version to 1.2.11 and enhance GitHub and Gitea release workflows with input validation and improved error handling
+
+
 ## [1.2.10] - 2025-02-18
 ### Added
 - enhance Gitea release workflow with API connection verification and URL validation; update version to 1.2.10

html/header.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/index.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/rfid.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/spoolman.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/upgrade.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/waage.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

html/wifi.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.4</span></h1>
+                <h1>FilaMan<span class="version">v1.2.60</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

platformio.ini

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

src/ota.cpp

@@ -16,15 +16,19 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
             return;
         }
 
-        if (!Update.begin(contentLength)) {
+        // Determine if this is a full image (firmware + SPIFFS) or just firmware
+        bool isFullImage = (contentLength > 0x3D0000); // SPIFFS starts at 0x3D0000
+
+        if (!Update.begin(contentLength, isFullImage ? U_FLASH : U_SPIFFS)) {
             Serial.printf("Not enough space: %u required\n", contentLength);
             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
             return;
         }
         
-        Serial.println("Update started");
+        Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
     }
     
+    // Write chunk to flash
     if (Update.write(data, len) != len) {
         Update.printError(Serial);
         request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");