.github/workflows/gitea-release.yml

@@ -2,6 +2,16 @@ name: Gitea Release
 
 on:
   workflow_call:
+    inputs:
+      gitea_server_url:
+        required: true
+        type: string
+      gitea_repository:
+        required: true
+        type: string
+    secrets:
+      GITEA_TOKEN:
+        required: true
 
 jobs:
   create-release:
@@ -24,11 +34,39 @@ jobs:
         sudo apt-get update
         sudo apt-get install xxd
     
-    - name: Build Firmware
+    - name: Check for SPIFFS changes
+      id: check_spiffs
+      run: |
+        git fetch --unshallow || true
+        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
+        if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then
+          echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT
+        else
+          echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT
+        fi
+    
+    - name: Check for Data changes
+      id: check_data
+      run: |
+        git fetch --unshallow || true
+        CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
+        if echo "$CHANGED_FILES" | grep -q "^data/"; then
+          echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT
+        else
+          echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT
+        fi
+    
+    - name: Get version from platformio.ini
+      id: get_version
       run: |
         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
+        echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
 
-        # Build firmware and SPIFFS
+    - name: Build Firmware
+      run: |
+        VERSION=${{ steps.get_version.outputs.VERSION }}
+        
+        # Always build firmware and SPIFFS
         echo "Building firmware and SPIFFS..."
         pio run -e esp32dev
         pio run -t buildfs
@@ -36,10 +74,10 @@ jobs:
         # Copy firmware binary
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
         
-        # Create SPIFFS binary
+        # Always create SPIFFS binary
         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
         
-        # Create full binary
+        # Create full binary (always)
         (cd .pio/build/esp32dev && 
         esptool.py --chip esp32 merge_bin \
           --fill-flash-size 4MB \
@@ -56,11 +94,29 @@ jobs:
         echo "File sizes:"
         (cd .pio/build/esp32dev && ls -lh *.bin)
         
-    - name: Get version from platformio.ini
+    - name: Prepare binaries
-      id: get_version
       run: |
-        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
+        VERSION=${{ steps.get_version.outputs.VERSION }}
-        echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+        
+        # Create full binary only if SPIFFS changed
+        if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then
+          echo "Creating full binary..."
+          cd .pio/build/esp32dev && \
+          esptool.py --chip esp32 merge_bin \
+            --fill-flash-size 4MB \
+            --flash_mode dio \
+            --flash_freq 40m \
+            --flash_size 4MB \
+            -o filaman_full_${VERSION}.bin \
+            0x0000 bootloader.bin \
+            0x8000 partitions.bin \
+            0x10000 firmware.bin \
+            0x390000 spiffs.bin
+        fi
+        
+        # Verify file sizes
+        echo "File sizes:"
+        cd .pio/build/esp32dev && ls -lh *.bin
 
     - name: Read CHANGELOG.md
       id: changelog
@@ -71,19 +127,56 @@ jobs:
         echo "$CHANGELOG" >> $GITHUB_OUTPUT
         echo "EOF" >> $GITHUB_OUTPUT
         
-    - name: Create Gitea Release
+    - name: Create Release
+      env:
+        TOKEN: ${{ secrets.GITEA_TOKEN }}
       run: |
+        API_URL="${{ inputs.gitea_server_url }}/api/v1"
+        REPO="${{ inputs.gitea_repository }}"
         VERSION=${{ steps.get_version.outputs.VERSION }}
-        cd .pio/build/esp32dev
         
-        # Prepare files for upload
+        # Create release
-        FILES=""
+        RESPONSE=$(curl -k -s \
-        for file in filaman_${VERSION}.bin webpage_${VERSION}.bin filaman_full_${VERSION}.bin; do
+          -X POST \
-          if [ -f "$file" ]; then
+          -H "Authorization: token ${TOKEN}" \
-            FILES="$FILES -a $file"
+          -H "Content-Type: application/json" \
+          -d "{
+            \"tag_name\":\"v${VERSION}\",
+            \"name\":\"Release ${VERSION}\",
+            \"body\":\"${{ steps.changelog.outputs.CHANGES }}\"
+          }" \
+          "${API_URL}/repos/${REPO}/releases")
+        
+        RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
+        
+        if [ -n "$RELEASE_ID" ]; then
+          echo "Release created with ID: $RELEASE_ID"
+          
+          # Always upload firmware and full binary
+          for file in filaman_${VERSION}.bin filaman_full_${VERSION}.bin; do
+            if [ -f ".pio/build/esp32dev/$file" ]; then
+              echo "Uploading $file..."
+              curl -k -s \
+                -X POST \
+                -H "Authorization: token ${TOKEN}" \
+                -H "Content-Type: application/octet-stream" \
+                --data-binary "@.pio/build/esp32dev/$file" \
+                "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
+            fi
+          done
+          
+          # Upload SPIFFS binary only if it exists (data changes)
+          if [ -f ".pio/build/esp32dev/webpage_${VERSION}.bin" ]; then
+            echo "Uploading webpage binary..."
+            curl -k -s \
+              -X POST \
+              -H "Authorization: token ${TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary "@.pio/build/esp32dev/webpage_${VERSION}.bin" \
+              "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=webpage_${VERSION}.bin"
           fi
-        done
+        else
-        
+          echo "Failed to create release. Response:"
-        # Create release using git command
+          echo "$RESPONSE"
-        git tag -a "v${VERSION}" -m "Release ${VERSION}"
+          exit 1
-        git push origin "v${VERSION}"
+        fi

.github/workflows/release.yml

@@ -6,27 +6,51 @@ on:
       - 'v*'
 
 jobs:
-  detect-provider:
+  route:
     runs-on: ubuntu-latest
     outputs:
       provider: ${{ steps.provider.outputs.provider }}
+      gitea_ref_name: ${{ steps.provider.outputs.gitea_ref_name }}
+      gitea_server_url: ${{ steps.provider.outputs.gitea_server_url }}
+      gitea_repository: ${{ steps.provider.outputs.gitea_repository }}
     steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Debug Environment
+        run: |
+          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 "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
+          echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
+
       - name: Determine CI Provider
         id: provider
         shell: bash
         run: |
           if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
             echo "provider=gitea" >> "$GITHUB_OUTPUT"
+            echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
+            echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT"
+            echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
           else
             echo "provider=github" >> "$GITHUB_OUTPUT"
           fi
 
   github-release:
-    needs: detect-provider
+    needs: route
-    if: needs.detect-provider.outputs.provider == 'github'
+    if: needs.route.outputs.provider == 'github'
     uses: ./.github/workflows/github-release.yml
 
   gitea-release:
-    needs: detect-provider
+    needs: route
-    if: needs.detect-provider.outputs.provider == 'gitea'
+    if: needs.route.outputs.provider == 'gitea'
     uses: ./.github/workflows/gitea-release.yml
+    with:
+      gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }}
+      gitea_server_url: ${{ needs.route.outputs.gitea_server_url }}
+      gitea_repository: ${{ needs.route.outputs.gitea_repository }}
+    secrets:
+      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}

CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## [1.3.11] - 2025-02-21
-### Changed
-- update webpages for version v1.3.11
-- ci: refactor Gitea release workflow by simplifying input handling and removing unnecessary checks
-
-
 ## [1.3.10] - 2025-02-21
 ### Changed
 - update webpages for version v1.3.10

platformio.ini

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