feat: update version to 1.2.30 and enhance release workflows for Gitea and GitHub with improved artifact handling and changelog integration

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

@@ -4,20 +4,63 @@ 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/checkout@v4
-      uses: actions/download-artifact@v3
+    
+    - name: Set up Python
+      uses: actions/setup-python@v4
       with:
-        name: firmware
+        python-version: '3.x'
-        path: firmware
+    
+    - 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:
@@ -94,7 +137,7 @@ jobs:
             -H "accept: application/json" \
             -H "Authorization: token ${GITEA_TOKEN}" \
             -H "Content-Type: application/octet-stream" \
-            --data-binary "@firmware/${file}" \
+            --data-binary "@.pio/build/esp32dev/${file}" \
             "${UPLOAD_URL}" 2>&1)
           
           echo "Full upload response for $file (including headers):"
@@ -118,7 +161,7 @@ jobs:
         
         # Update release with full description after successful file upload
         echo "Updating release description..."
-        CHANGELOG='${{ needs.build.outputs.changelog }}'
+        CHANGELOG='${{ steps.changelog.outputs.CHANGES }}'
         UPDATE_RESPONSE=$(curl $CURL_OPTS -X PATCH \
           -H "accept: application/json" \
           -H "Authorization: token ${GITEA_TOKEN}" \

.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/checkout@v4
-      uses: actions/download-artifact@v3
+    
+    - name: Set up Python
+      uses: actions/setup-python@v4
       with:
-        name: firmware
+        python-version: '3.x'
-        path: firmware
+    
+    - 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 }}" \
+          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
-          --notes "${{ needs.build.outputs.changelog }}" \
+          --notes "${{ steps.changelog.outputs.CHANGES }}" \
-          firmware/filaman_full.bin \
+          .pio/build/esp32dev/filaman_full.bin \
-          firmware/filaman_ota.bin
+          .pio/build/esp32dev/filaman_ota.bin

.github/workflows/release.yml

@@ -53,11 +53,11 @@ jobs:
           fi
 
   github-release:
-    needs: [route, verify-provider]
+    needs: verify-provider
     if: needs.route.outputs.provider == 'github'
     uses: ./.github/workflows/providers/github-release.yml
 
   gitea-release:
-    needs: [route, verify-provider]
+    needs: verify-provider
     if: needs.route.outputs.provider == 'gitea'
     uses: ./.github/workflows/providers/gitea-release.yml

platformio.ini

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