docs: update changelog for version 1.3.17

.github/workflows/gitea-release.yml

@@ -2,16 +2,6 @@ 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:
@@ -34,50 +24,22 @@ jobs:
         sudo apt-get update
         sudo apt-get install xxd
     
-    - 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
-
     - name: Build Firmware
       run: |
-        VERSION=${{ steps.get_version.outputs.VERSION }}
+        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
         
-        # Always build firmware and SPIFFS
+        # Build firmware and SPIFFS
         echo "Building firmware and SPIFFS..."
         pio run -e esp32dev
         pio run -t buildfs
         
         # Copy firmware binary
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
         
-        # Always create SPIFFS binary
+        # Create SPIFFS binary
-        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
         
-        # Create full binary (always)
+        # Create full binary
         (cd .pio/build/esp32dev && 
         esptool.py --chip esp32 merge_bin \
           --fill-flash-size 4MB \
@@ -94,29 +56,11 @@ jobs:
         echo "File sizes:"
         (cd .pio/build/esp32dev && ls -lh *.bin)
     
-    - name: Prepare binaries
+    - name: Get version from platformio.ini
+      id: get_version
       run: |
-        VERSION=${{ steps.get_version.outputs.VERSION }}
+        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
-        
+        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
@@ -127,56 +71,19 @@ jobs:
         echo "$CHANGELOG" >> $GITHUB_OUTPUT
         echo "EOF" >> $GITHUB_OUTPUT
 
-    - name: Create Release
+    - name: Create Gitea 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
         
-        # Create release
+        # Prepare files for upload
-        RESPONSE=$(curl -k -s \
+        FILES=""
-          -X POST \
+        for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${VERSION}.bin filaman_full_${VERSION}.bin; do
-          -H "Authorization: token ${TOKEN}" \
+          if [ -f "$file" ]; then
-          -H "Content-Type: application/json" \
+            FILES="$FILES -a $file"
-          -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)
+        # Create release using git command
-          if [ -f ".pio/build/esp32dev/webpage_${VERSION}.bin" ]; then
+        #git tag -a "v${VERSION}" -m "Release ${VERSION}"
-            echo "Uploading webpage binary..."
+        #git push origin "v${VERSION}"
-            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
-        else
-          echo "Failed to create release. Response:"
-          echo "$RESPONSE"
-          exit 1
-        fi

.github/workflows/github-release.yml

@@ -2,14 +2,23 @@ name: GitHub Release
 
 on:
   workflow_call:
+    secrets:
+      RELEASE_TOKEN:
+        description: 'GitHub token for release creation'
+        required: true
+
+permissions:
+  contents: write
 
 jobs:
   create-release:
     runs-on: ubuntu-latest
-    #permissions:
+    permissions:
-    #  contents: write
+      contents: write
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
     
     - name: Set up Python
       uses: actions/setup-python@v4
@@ -58,10 +67,10 @@ jobs:
         pio run -t buildfs
         
         # Copy firmware binary
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
         
         # Always create SPIFFS binary
-        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
         
         # Create full binary (always)
         (cd .pio/build/esp32dev && 
@@ -97,22 +106,22 @@ jobs:
 
     - name: Create GitHub Release
       env:
-        GH_TOKEN: ${{ github.token }}
+        GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
       run: |
         VERSION=${{ steps.get_version.outputs.VERSION }}
+        cd .pio/build/esp32dev
         
         # Create release with available files
-        cd .pio/build/esp32dev
         FILES_TO_UPLOAD=""
         
         # Always add firmware
-        if [ -f "filaman_${VERSION}.bin" ]; then
+        if [ -f "update_filaman_firmware_v${VERSION}.bin" ]; then
-          FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_${VERSION}.bin"
+          FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_firmware_v${VERSION}.bin"
         fi
         
         # Add SPIFFS and full binary only if they exist
-        if [ -f "webpage_${VERSION}.bin" ]; then
+        if [ -f "update_filaman_website_v${VERSION}.bin" ]; then
-          FILES_TO_UPLOAD="$FILES_TO_UPLOAD webpage_${VERSION}.bin"
+          FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin"
         fi
         
         if [ -f "filaman_full_${VERSION}.bin" ]; then

.github/workflows/release.yml

@@ -5,66 +5,35 @@ on:
     tags:
       - 'v*'
 
+permissions:
+  contents: write
+
 jobs:
-  route:
+  detect-provider:
     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"
-          elif [ "${GITHUB_ACTIONS}" = "true" ]; then
-            echo "provider=github" >> "$GITHUB_OUTPUT"
           else
-            echo "provider=unknown" >> "$GITHUB_OUTPUT"
+            echo "provider=github" >> "$GITHUB_OUTPUT"
-          fi
-
-  verify-provider:
-    needs: route
-    runs-on: ubuntu-latest
-    steps:
-      - name: Echo detected provider
-        run: |
-          echo "Detected CI Provider: ${{ needs.route.outputs.provider }}"
-          if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then
-            echo "::error::Failed to detect CI provider!"
-            exit 1
           fi
 
   github-release:
-    needs: [route, verify-provider]
+    needs: detect-provider
-    if: needs.route.outputs.provider == 'github'
+    permissions:
+      contents: write
+    if: needs.detect-provider.outputs.provider == 'github'
     uses: ./.github/workflows/github-release.yml
+    secrets:
+      RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   gitea-release:
-    needs: [route, verify-provider]
+    needs: detect-provider
-    if: needs.route.outputs.provider == 'gitea'
+    if: needs.detect-provider.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,5 +1,55 @@
 # Changelog
 
+## [1.3.17] - 2025-02-21
+### Changed
+- update webpages for version v1.3.17
+- ci: comment out git tag and push commands in gitea-release workflow
+
+
+## [1.3.16] - 2025-02-21
+### Changed
+- update webpages for version v1.3.16
+- ci: update filenames for firmware and website binaries in release workflows
+
+
+## [1.3.15] - 2025-02-21
+### Changed
+- update webpages for version v1.3.15
+
+### Fixed
+- ci: fix missing 'fi' in GitHub release workflow script
+
+
+## [1.3.14] - 2025-02-21
+### Changed
+- update webpages for version v1.3.14
+- ci: update GitHub release workflow to improve file upload handling
+
+
+## [1.3.13] - 2025-02-21
+### Changed
+- update webpages for version v1.3.13
+- ci: update GitHub release workflow to use RELEASE_TOKEN for improved security
+
+
+## [1.3.12] - 2025-02-21
+### Changed
+- update webpages for version v1.3.12
+- ci: enhance GitHub release workflow with token handling and file upload improvements
+
+
+## [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
+- ci: simplify GitHub release workflow by removing provider verification step
+
+
 ## [1.3.9] - 2025-02-21
 ### Changed
 - update webpages for version v1.3.9

platformio.ini

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