docs: update changelog for version 1.2.24

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

@@ -11,15 +11,11 @@ on:
         type: string
 
 permissions:
-  contents: write      # Required for creating releases
-  issues: read        # Required for reading changelog
-  pull-requests: read # Required for reading changelog
+  contents: write
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     steps:
     - uses: actions/checkout@v4
     
@@ -32,8 +28,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install --upgrade platformio esptool
-        sudo apt-get update
-        sudo apt-get install -y jq
     
     - name: Build Firmware
       run: |
@@ -55,64 +49,12 @@ jobs:
     - name: Prepare OTA firmware
       run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
     
-    - name: Create Release
+    - name: Create GitHub Release
       env:
-        GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-        GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
-        GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        # Validate and sanitize API URL
-        if [[ ! "$GITEA_API_URL" =~ ^https?:// ]]; then
-          echo "Error: GITEA_API_URL must start with http:// or https://"
-          exit 1
-        fi
-        
-        # Remove trailing slash and ensure /api/v1
-        GITEA_API_URL="${GITEA_API_URL%/}"
-        if [[ ! "$GITEA_API_URL" =~ /api/v1$ ]]; then
-          GITEA_API_URL="${GITEA_API_URL}/api/v1"
-        fi
-        
-        echo "Creating Gitea release..."
-        RESPONSE=$(curl -sS -X POST \
-          -H "Authorization: token ${GITEA_TOKEN}" \
-          -H "Content-Type: application/json" \
-          -H "Accept: application/json" \
-          "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
-          -d @- << EOF
-{
-  "tag_name": "${{ github.ref_name }}",
-  "name": "Release ${{ inputs.version }}",
-  "body": ${{ toJSON(inputs.changelog) }},
-  "draft": false,
-  "prerelease": false
-}
-EOF
-)
-        
-        # 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 .
-          exit 1
-        fi
-        
-        # Upload binary files
-        for file in "filaman_full.bin" "filaman_ota.bin"; do
-          echo "Uploading $file..."
-          if ! curl -sS -X POST \
-            -H "Authorization: token ${GITEA_TOKEN}" \
-            -H "Content-Type: application/octet-stream" \
-            "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=${file}" \
-            --data-binary "@.pio/build/esp32dev/${file}"; then
-            echo "Error: Failed to upload $file"
-            exit 1
-          fi
-          echo "Successfully uploaded $file"
-        done
-      }
-    }
-  }
-}
+        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"

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

@@ -11,15 +11,11 @@ on:
         type: string
 
 permissions:
-  contents: write      # Required for creating releases
-  issues: read        # Required for reading changelog
-  pull-requests: read # Required for reading changelog
+  contents: write
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write # Required for creating releases at job level
     steps:
     - uses: actions/checkout@v4
     
@@ -35,8 +31,8 @@ jobs:
     
     - name: Build Firmware
       run: |
-        pio run -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+        pio run -t buildfs
+        pio run
         
     - name: Merge firmware and SPIFFS
       run: |
@@ -53,7 +49,7 @@ jobs:
     - name: Prepare OTA firmware
       run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
     
-    - name: Create Release
+    - name: Create GitHub Release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |

.github/workflows/release.yml

@@ -1,57 +1,60 @@
-name: Release
+name: GitHub Release
 
 on:
-  push:
-    tags:
-      - 'v*'
+  workflow_call:
+    inputs:
+      version:
+        required: true
+        type: string
+      changelog:
+        required: true
+        type: string
+
+permissions:
+  contents: write
 
 jobs:
-  prepare:
-    runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.get_version.outputs.VERSION }}
-      changelog: ${{ steps.changelog.outputs.CHANGES }}
-    steps:
-      - uses: actions/checkout@v4
-      
-      - name: Get version from tag
-        id: get_version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-      
-      - name: Verify version match
-        run: |
-          PIO_VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
-          TAG_VERSION=${{ steps.get_version.outputs.VERSION }}
-          
-          if [ "$PIO_VERSION" != "$TAG_VERSION" ]; then
-            echo "Error: Version mismatch between tag ($TAG_VERSION) and platformio.ini ($PIO_VERSION)"
-            exit 1
-          fi
-      
-      - 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: Determine provider
-        id: detect-provider
-        run: |
-          if [[ "$GITHUB_SERVER_URL" == "https://github.com" ]]; then
-            echo "provider=github" >> $GITHUB_OUTPUT
-          else
-            echo "provider=gitea" >> $GITHUB_OUTPUT
-          fi
-
-  release:
-    needs: prepare
+  build:
     runs-on: ubuntu-latest
     steps:
-      - name: Run provider workflow
-        uses: ./.github/workflows/providers/${{ needs.prepare.outputs.provider == 'github' && 'github' || 'gitea' }}-release.yml
-        with:
-          version: ${{ needs.prepare.outputs.version }}
-          changelog: ${{ needs.prepare.outputs.changelog }}
-        secrets: inherit
+    - 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
+
+    - 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 }}
+      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"

CHANGELOG.md

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

platformio.ini

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