docs: update changelog for version 1.2.26

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

@@ -1,63 +1,80 @@
 name: Gitea Release
 
 on:
-  workflow_call:
-    inputs:
-      version:
-        type: string
-        required: true
-      changelog:
-        type: string
-        required: true
+  workflow_call:  # This ensures the workflow can only be called from another workflow
 
 jobs:
-  release:
-    runs-on: gitea-runner-1
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write      # Required for creating releases
+      issues: read        # Required for reading changelog
+      pull-requests: read # Required for reading changelog
     steps:
-      - name: Debug Info
-        run: |
-          echo "Version: ${{ inputs.version }}"
-          echo "Changelog: ${{ inputs.changelog }}"
-          echo "Tag: ${GITHUB_REF#refs/tags/}"
-          
-      - uses: actions/checkout@v4
+    - 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: |
+        # 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
       
-      - 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" \
-            -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 }}
+    - 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 and Configure GitHub CLI
+      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 }}
+      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_ota.bin#filaman_ota.bin"

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

@@ -1,21 +1,18 @@
-name: GitHub Release
+name: Github Release
 
 on:
-  workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-      changelog:
-        required: true
-        type: string
+  workflow_call:  # This ensures the workflow can only be called from another workflow
 
 permissions:
-  contents: write
+  contents: write      # Required for creating releases
+  issues: read        # Required for reading changelog
+  pull-requests: read # Required for reading changelog
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write # Required for creating releases at job level
     steps:
     - uses: actions/checkout@v4
     
@@ -24,15 +21,19 @@ jobs:
       with:
         python-version: '3.x'
     
-    - name: Install dependencies
+    - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
-        pip install --upgrade platformio esptool
+        pip install --upgrade platformio
     
     - name: Build Firmware
       run: |
-        pio run -t buildfs
-        pio run
+        pio run -t buildfs  # Build SPIFFS
+        pio run            # Build firmware
+        
+    - name: Install esptool
+      run: |
+        pip install esptool
         
     - name: Merge firmware and SPIFFS
       run: |
@@ -47,14 +48,36 @@ jobs:
           0x290000 .pio/build/esp32dev/spiffs.bin
 
     - name: Prepare OTA firmware
-      run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
+      run: |
+        # Use PlatformIO to create a proper OTA image
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
     
-    - name: Create GitHub Release
+    - 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 and Configure GitHub CLI
+      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:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         gh release create "${{ github.ref_name }}" \
-          --title "Release ${{ inputs.version }}" \
-          --notes "${{ inputs.changelog }}" \
+          --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_ota.bin#filaman_ota.bin"

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: Release Workflow
 
 on:
   push:
@@ -6,36 +6,31 @@ 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: Determine CI Provider
+        id: provider
         run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-      
-      - name: Get changelog
-        id: changelog
-        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://gitlab.fire-devils.org'
-        uses: ./.github/workflows/providers/gitea-release.yml
-        with:
-          version: ${{ steps.version.outputs.version }}
-          changelog: ${{ steps.changelog.outputs.changelog }}
+          if [[ "$GITHUB_ACTIONS" == "true" ]]; then
+            echo "provider=github" >> $GITHUB_OUTPUT
+          elif [[ "$GITEA_ACTIONS" == "true" ]]; then
+            echo "provider=gitea" >> $GITHUB_OUTPUT
+          else
+            echo "provider=unknown" >> $GITHUB_OUTPUT
+          fi
+
+  github-release:
+    needs: route
+    if: needs.route.outputs.provider == 'github'
+    uses: ./.github/workflows/providers/github-release.yml
+
+  gitea-release:
+    needs: route
+    if: needs.route.outputs.provider == 'gitea'
+    uses: ./.github/workflows/providers/gitea-release.yml

CHANGELOG.md

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

platformio.ini

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