docs: update changelog for version 1.2.32

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

@@ -4,86 +4,177 @@ on:
   workflow_call:
 
 jobs:
-  build:
-    uses: ./.github/workflows/providers/build.yml
-
   create-release:
-    needs: build
     runs-on: ubuntu-latest
     permissions:
       contents: write
     steps:
-    - name: Download artifacts
-      uses: actions/download-artifact@v3
+    - uses: actions/checkout@v4
+    
+    - name: Set up Python
+      uses: actions/setup-python@v4
       with:
-        name: firmware
-        path: firmware
+        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: |
+        TAG="${GITEA_REF_NAME}"
+        VERSION="${TAG#v}"
+        echo "VERSION=$VERSION" >> $GITEA_OUTPUT
+      
+    - name: Read CHANGELOG.md
+      id: changelog
+      run: |
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        echo "CHANGES<<EOF" >> $GITEA_OUTPUT
+        echo "$CHANGELOG" >> $GITEA_OUTPUT
+        echo "EOF" >> $GITEA_OUTPUT
 
     - name: Create Gitea Release
       env:
         GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
       run: |
-        # Determine API URL if not set
-        API_URL="${GITEA_API_URL:-${GITEA_SERVER_URL}/api/v1}"
+        # Debug: Print all environment variables (excluding the token)
+        env | grep -v "GITEA_TOKEN"
+        
+        # Remove trailing slash from server URL if present
+        SERVER_URL="${GITEA_SERVER_URL%/}"
         REPO="${GITEA_REPOSITORY}"
         TAG="${GITEA_REF_NAME}"
+        VERSION="${TAG#v}"  # Remove v prefix if present
         
-        if [ -z "$API_URL" ] || [ -z "$REPO" ] || [ -z "$TAG" ]; then
-          echo "Error: Required Gitea environment variables are not set"
-          env
-          exit 1
-        fi
-        
-        # Escape changelog content for JSON
-        CHANGELOG_ESCAPED=$(echo '${{ needs.build.outputs.changelog }}' | jq -sR .)
-        
-        echo "Creating release for tag: $TAG"
-        echo "Using API URL: $API_URL"
+        echo "Debug environment:"
+        echo "Server URL: $SERVER_URL"
         echo "Repository: $REPO"
+        echo "Tag: $TAG"
+        echo "Version: $VERSION"
         
-        # Create release using Gitea API
-        RELEASE_DATA=$(cat <<EOF
-        {
-          "tag_name": "$TAG",
-          "name": "Release ${{ needs.build.outputs.version }}",
-          "body": ${CHANGELOG_ESCAPED}
-        }
-        EOF
-        )
+        # Test API connectivity
+        echo "Testing API connectivity..."
+        TEST_RESPONSE=$(curl -v -k -H "Authorization: token ${GITEA_TOKEN}" "${SERVER_URL}/api/v1/version" 2>&1)
+        echo "API Test Response:"
+        echo "$TEST_RESPONSE"
         
-        echo "Release data:"
-        echo "$RELEASE_DATA" | jq '.'
+        # Construct clean API URL
+        API_URL="${SERVER_URL}/api/v1"
+        RELEASE_URL="${API_URL}/repos/${REPO}/releases"
         
-        # Create the release
-        RELEASE_ID=$(curl -X POST \
+        echo "Using Release API URL: $RELEASE_URL"
+        
+        # Common curl options
+        CURL_OPTS="-v -k"  # -v for verbose, -k to ignore SSL verification
+        
+        # Create release with minimal data first
+        echo "Creating release..."
+        RELEASE_RESPONSE=$(curl $CURL_OPTS -X POST \
+          -H "accept: application/json" \
           -H "Authorization: token ${GITEA_TOKEN}" \
           -H "Content-Type: application/json" \
-          -d "$RELEASE_DATA" \
-          "${API_URL}/repos/${REPO}/releases" \
-          | tee /dev/stderr \
-          | jq -r '.id')
+          -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${VERSION}\",\"draft\":false,\"prerelease\":false}" \
+          "${RELEASE_URL}" 2>&1)
+        
+        echo "Full release creation response (including headers):"
+        echo "$RELEASE_RESPONSE"
+        
+        # Extract the JSON response (last line)
+        RELEASE_JSON=$(echo "$RELEASE_RESPONSE" | tail -n 1)
+        echo "Release JSON response:"
+        echo "$RELEASE_JSON" | jq '.' || echo "Failed to parse JSON response"
+        
+        # Get release ID
+        RELEASE_ID=$(echo "$RELEASE_JSON" | jq -r '.id')
         
         if [ -z "$RELEASE_ID" ] || [ "$RELEASE_ID" = "null" ]; then
-          echo "Failed to create release"
+          echo "Failed to create release. Full response:"
+          echo "$RELEASE_RESPONSE"
+          # Try to get more detailed error information
+          ERROR_MSG=$(echo "$RELEASE_JSON" | jq -r '.message // .error // "Unknown error"')
+          echo "Error message: $ERROR_MSG"
           exit 1
         fi
         
-        echo "Created release with ID: $RELEASE_ID"
+        echo "Successfully created release with ID: $RELEASE_ID"
         
-        # Upload the binary files
+        # Upload assets
         for file in "filaman_full.bin" "filaman_ota.bin"; do
           echo "Uploading $file..."
-          RESPONSE=$(curl -X POST \
+          UPLOAD_URL="${RELEASE_URL}/${RELEASE_ID}/assets?name=${file}"
+          echo "Upload URL: $UPLOAD_URL"
+          
+          UPLOAD_RESPONSE=$(curl $CURL_OPTS -X POST \
+            -H "accept: application/json" \
             -H "Authorization: token ${GITEA_TOKEN}" \
             -H "Content-Type: application/octet-stream" \
-            --data-binary @"firmware/$file" \
-            "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file")
+            --data-binary "@.pio/build/esp32dev/${file}" \
+            "${UPLOAD_URL}" 2>&1)
           
-          if echo "$RESPONSE" | jq -e '.id' > /dev/null; then
-            echo "Successfully uploaded $file"
-          else
-            echo "Failed to upload $file"
-            echo "Response: $RESPONSE"
+          echo "Full upload response for $file (including headers):"
+          echo "$UPLOAD_RESPONSE"
+          
+          # Extract the JSON response (last line)
+          UPLOAD_JSON=$(echo "$UPLOAD_RESPONSE" | tail -n 1)
+          echo "Upload JSON response:"
+          echo "$UPLOAD_JSON" | jq '.' || echo "Failed to parse JSON response"
+          
+          if ! echo "$UPLOAD_JSON" | jq -e '.id' > /dev/null; then
+            echo "Failed to upload $file. Full response:"
+            echo "$UPLOAD_RESPONSE"
+            ERROR_MSG=$(echo "$UPLOAD_JSON" | jq -r '.message // .error // "Unknown error"')
+            echo "Error message: $ERROR_MSG"
             exit 1
           fi
-        done
+          
+          echo "Successfully uploaded $file"
+        done
+        
+        # Update release with full description after successful file upload
+        echo "Updating release description..."
+        CHANGELOG='${{ steps.changelog.outputs.CHANGES }}'
+        UPDATE_RESPONSE=$(curl $CURL_OPTS -X PATCH \
+          -H "accept: application/json" \
+          -H "Authorization: token ${GITEA_TOKEN}" \
+          -H "Content-Type: application/json" \
+          -d "{\"body\":$(echo "$CHANGELOG" | jq -R -s .)}" \
+          "${RELEASE_URL}/${RELEASE_ID}" 2>&1)
+        
+        echo "Full update response (including headers):"
+        echo "$UPDATE_RESPONSE"
+        
+        # Extract the JSON response (last line)
+        UPDATE_JSON=$(echo "$UPDATE_RESPONSE" | tail -n 1)
+        echo "Update JSON response:"
+        echo "$UPDATE_JSON" | jq '.' || echo "Failed to parse JSON response"
+        
+        echo "Release process completed"

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

@@ -4,27 +4,68 @@ on:
   workflow_call:
 
 jobs:
-  build:
-    uses: ./.github/workflows/providers/build.yml
-
   create-release:
-    needs: build
     runs-on: ubuntu-latest
     permissions:
       contents: write
     steps:
-    - name: Download artifacts
-      uses: actions/download-artifact@v3
+    - uses: actions/checkout@v4
+    
+    - name: Set up Python
+      uses: actions/setup-python@v4
       with:
-        name: firmware
-        path: firmware
+        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: |
+        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: Create GitHub Release
       env:
         GH_TOKEN: ${{ github.token }}
       run: |
         gh release create "${{ github.ref_name }}" \
-          --title "Release ${{ needs.build.outputs.version }}" \
-          --notes "${{ needs.build.outputs.changelog }}" \
-          firmware/filaman_full.bin \
-          firmware/filaman_ota.bin
+          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
+          --notes "${{ steps.changelog.outputs.CHANGES }}" \
+          .pio/build/esp32dev/filaman_full.bin \
+          .pio/build/esp32dev/filaman_ota.bin

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [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

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.29</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.29</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.29</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.29</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.29</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.29</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.29</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.28"
+version = "1.2.32"
 
 [env:esp32dev]
 platform = espressif32