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

@@ -1,20 +1,21 @@
-name: Github Release
+name: GitHub Release
 
 on:
-  push:
+  workflow_call:
-    tags:
+    inputs:
-      - 'v*'
+      version:
+        required: true
+        type: string
+      changelog:
+        required: true
+        type: string
 
 permissions:
-  contents: write      # Required for creating releases
+  contents: write
-  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
     
@@ -23,19 +24,15 @@ jobs:
       with:
         python-version: '3.x'
     
-    - name: Install PlatformIO
+    - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install --upgrade platformio
+        pip install --upgrade platformio esptool
     
     - name: Build Firmware
       run: |
-        pio run -t buildfs  # Build SPIFFS
+        pio run -t buildfs
-        pio run            # Build firmware
+        pio run
-        
-    - name: Install esptool
-      run: |
-        pip install esptool
         
     - name: Merge firmware and SPIFFS
       run: |
@@ -50,36 +47,14 @@ jobs:
           0x290000 .pio/build/esp32dev/spiffs.bin
 
     - name: Prepare OTA firmware
-      run: |
+      run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-        # 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
+    - name: Create GitHub Release
-      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:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         gh release create "${{ github.ref_name }}" \
-          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
+          --title "Release ${{ inputs.version }}" \
-          --notes "${{ steps.changelog.outputs.CHANGES }}" \
+          --notes "${{ inputs.changelog }}" \
           ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
           ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"

.github/workflows/release.yml

@@ -1,20 +1,21 @@
-name: Create Release
+name: GitHub Release
 
 on:
-  push:
+  workflow_call:
-    tags:
+    inputs:
-      - 'v*'
+      version:
+        required: true
+        type: string
+      changelog:
+        required: true
+        type: string
 
 permissions:
-  contents: write      # Required for creating releases
+  contents: write
-  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
     
@@ -23,19 +24,15 @@ jobs:
       with:
         python-version: '3.x'
     
-    - name: Install PlatformIO
+    - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install --upgrade platformio
+        pip install --upgrade platformio esptool
     
     - name: Build Firmware
       run: |
-        pio run -t buildfs  # Build SPIFFS
+        pio run -t buildfs
-        pio run            # Build firmware
+        pio run
-        
-    - name: Install esptool
-      run: |
-        pip install esptool
         
     - name: Merge firmware and SPIFFS
       run: |
@@ -50,36 +47,14 @@ jobs:
           0x290000 .pio/build/esp32dev/spiffs.bin
 
     - name: Prepare OTA firmware
-      run: |
+      run: cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-        # 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
+    - name: Create GitHub Release
-      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:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         gh release create "${{ github.ref_name }}" \
-          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
+          --title "Release ${{ inputs.version }}" \
-          --notes "${{ steps.changelog.outputs.CHANGES }}" \
+          --notes "${{ inputs.changelog }}" \
           ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
           ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"

CHANGELOG.md

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

platformio.ini

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