docs: update changelog for version 1.2.33

.github/workflows/providers/build.yml

@@ -0,0 +1,87 @@
+name: Build Firmware
+
+on:
+  workflow_call:
+    outputs:
+      version:
+        description: "The version from the tag"
+        value: ${{ jobs.build.outputs.version }}
+      changelog:
+        description: "The changelog for the current version"
+        value: ${{ jobs.build.outputs.changelog }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.get_version.outputs.VERSION }}
+      changelog: ${{ steps.changelog.outputs.CHANGES }}
+    steps:
+    - uses: actions/checkout@v4
+    
+    - 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: |
+        if [ -n "$GITEA_REF" ]; then
+          echo "VERSION=${GITEA_REF#refs/tags/v}" >> $GITEA_OUTPUT
+        else
+          echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+        fi
+      
+    - 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)
+        if [ -n "$GITEA_OUTPUT" ]; then
+          echo "CHANGES<<EOF" >> $GITEA_OUTPUT
+          echo "$CHANGELOG" >> $GITEA_OUTPUT
+          echo "EOF" >> $GITEA_OUTPUT
+        else
+          echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+          echo "$CHANGELOG" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+        fi
+    
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: firmware
+        path: |
+          .pio/build/esp32dev/filaman_full.bin
+          .pio/build/esp32dev/filaman_ota.bin

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

@@ -2,62 +2,136 @@ name: Gitea Release
 
 on:
   workflow_call:
-    inputs:
-      version:
-        type: string
-        required: true
-      changelog:
-        type: string
-        required: true
 
 jobs:
-  release:
-    runs-on: gitea-runner
+  build:
+    uses: ./.github/workflows/providers/build.yml
+
+  create-release:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
-      - name: Debug Info
-        run: |
-          echo "Version: ${{ inputs.version }}"
-          echo "Changelog: ${{ inputs.changelog }}"
-          echo "Tag: ${GITHUB_REF#refs/tags/}"
+    - name: Download artifacts
+      uses: actions/download-artifact@v3
+      with:
+        name: firmware
+        path: firmware
+
+    - name: Create Gitea Release
+      env:
+        GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+      run: |
+        # 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
+        
+        echo "Debug environment:"
+        echo "Server URL: $SERVER_URL"
+        echo "Repository: $REPO"
+        echo "Tag: $TAG"
+        echo "Version: $VERSION"
+        
+        # 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"
+        
+        # Construct clean API URL
+        API_URL="${SERVER_URL}/api/v1"
+        RELEASE_URL="${API_URL}/repos/${REPO}/releases"
+        
+        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 "{\"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. 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 "Successfully created release with ID: $RELEASE_ID"
+        
+        # Upload assets
+        for file in "filaman_full.bin" "filaman_ota.bin"; do
+          echo "Uploading $file..."
+          UPLOAD_URL="${RELEASE_URL}/${RELEASE_ID}/assets?name=${file}"
+          echo "Upload URL: $UPLOAD_URL"
           
-      - uses: actions/checkout@v4
-      
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-      
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install platformio esptool
-      
-      - name: Build
-        run: |
-          pio run -t buildfs
-          pio run
-          
-      - name: Create full firmware
-        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
-          cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-      
-      - name: Create Release
-        run: |
-          TAG="${GITHUB_REF#refs/tags/}"
-          curl -X POST "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
+          UPLOAD_RESPONSE=$(curl $CURL_OPTS -X POST \
+            -H "accept: application/json" \
             -H "Authorization: token ${GITEA_TOKEN}" \
-            -H "Content-Type: application/json" \
-            -d "{\"tag_name\":\"$TAG\",\"name\":\"Release ${{ inputs.version }}\",\"body\":\"${{ inputs.changelog }}\",\"draft\":false,\"prerelease\":false}"
-        env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
-          GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
+            -H "Content-Type: application/octet-stream" \
+            --data-binary "@firmware/${file}" \
+            "${UPLOAD_URL}" 2>&1)
+          
+          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
+          
+          echo "Successfully uploaded $file"
+        done
+        
+        # Update release with full description after successful file upload
+        echo "Updating release description..."
+        CHANGELOG='${{ needs.build.outputs.changelog }}'
+        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

@@ -2,59 +2,29 @@ name: GitHub Release
 
 on:
   workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-      changelog:
-        required: true
-        type: string
-
-permissions:
-  contents: write
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.x'
-    
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade platformio esptool
-    
-    - name: Build Firmware
-      run: |
-        pio run -t buildfs
-        pio run
-        
-    - 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
+    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
+      with:
+        name: firmware
+        path: firmware
 
-    - name: Prepare OTA firmware
-      run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-    
     - name: Create GitHub Release
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GH_TOKEN: ${{ github.token }}
       run: |
         gh release create "${{ github.ref_name }}" \
-          --title "Release ${{ inputs.version }}" \
-          --notes "${{ inputs.changelog }}" \
-          ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
-          ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
+          --title "Release ${{ needs.build.outputs.version }}" \
+          --notes "${{ needs.build.outputs.changelog }}" \
+          firmware/filaman_full.bin \
+          firmware/filaman_ota.bin

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: Release Workflow
 
 on:
   push:
@@ -6,36 +6,58 @@ on:
       - 'v*'
 
 jobs:
-  prepare:
-    runs-on: gitea-runner
+  route:
+    runs-on: ubuntu-latest
     outputs:
-      version: ${{ steps.version.outputs.version }}
-      changelog: ${{ steps.changelog.outputs.changelog }}
+      provider: ${{ steps.provider.outputs.provider }}
     steps:
-      - uses: actions/checkout@v4
-      
-      - name: Get version from tag
-        id: version
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Debug Environment
         run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-      
-      - name: Get changelog
-        id: changelog
+          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 "RUNNER_NAME=${RUNNER_NAME:-not set}"
+
+      - name: Determine CI Provider
+        id: provider
+        shell: bash
         run: |
-          echo "$CHANGELOG" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-      
-      - name: Run GitHub Release
-        if: github.server_url == 'https://github.com'
-        uses: ./.github/workflows/providers/github-release.yml
-        with:
-          version: ${{ steps.version.outputs.version }}
-          changelog: ${{ steps.changelog.outputs.changelog }}
-        
-      - name: Run Gitea Release
-        if: github.server_url != 'https://github.com'
-        uses: ./.github/workflows/providers/gitea-release.yml
-        with:
-          version: ${{ steps.version.outputs.version }}
-          changelog: ${{ steps.changelog.outputs.changelog }}
+          # Initialize provider as unknown
+          PROVIDER="unknown"
+          
+          # Check for Gitea specific environment first
+          if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
+            PROVIDER="gitea"
+          # Then check for GitHub
+          elif [ "${GITHUB_ACTIONS}" = "true" ]; then
+            PROVIDER="github"
+          fi
+          
+          echo "Detected provider: ${PROVIDER}"
+          echo "provider=${PROVIDER}" >> "${GITHUB_OUTPUT}"
+
+  verify-provider:
+    needs: route
+    runs-on: ubuntu-latest
+    steps:
+      - name: Echo detected provider
+        run: |
+          echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
+          if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
+            echo "::error::Failed to detect CI provider!"
+            exit 1
+          fi
+
+  github-release:
+    needs: verify-provider
+    if: needs.route.outputs.provider == 'github'
+    uses: ./.github/workflows/providers/github-release.yml
+
+  gitea-release:
+    needs: verify-provider
+    if: needs.route.outputs.provider == 'gitea'
+    uses: ./.github/workflows/providers/gitea-release.yml

CHANGELOG.md

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

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.20"
+version = "1.2.33"
 
 [env:esp32dev]
 platform = espressif32