docs: update changelog for version 1.3.10

.github/workflows/github-release.yml

@@ -6,8 +6,8 @@ on:
 jobs:
   create-release:
     runs-on: ubuntu-latest
-    permissions:
+    #permissions:
-      contents: write
+    #  contents: write
     steps:
     - uses: actions/checkout@v4
     
@@ -61,7 +61,7 @@ jobs:
         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${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/webpage_${VERSION}.bin
         
         # Create full binary (always)
         (cd .pio/build/esp32dev && 

.github/workflows/release.yml

@@ -35,202 +35,22 @@ jobs:
             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
-
   github-release:
-    needs: [route, verify-provider]
+    needs: route
     if: needs.route.outputs.provider == 'github'
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/github-release.yml
-    permissions:
-      contents: write
-    steps:
-    - 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 esptool
-    - name: Install xxd
-      run: |
-        sudo apt-get update
-        sudo apt-get install xxd
-    - 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: 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: Build Firmware
-      run: |
-        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
-        echo "Building firmware and SPIFFS..."
-        pio run -e esp32dev
-        pio run -t buildfs
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
-        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
-        (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 0x1000 bootloader.bin 0x8000 partitions.bin 0x10000 firmware.bin 0x390000 spiffs.bin)
-        echo "File sizes:"
-        (cd .pio.build/esp32dev && ls -lh *.bin)
-    - name: Get version from platformio.ini
-      id: get_version
-      run: |
-        VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
-        echo "VERSION=$VERSION" >> $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: |
-        VERSION=${{ steps.get_version.outputs.VERSION }}
-        cd .pio/build/esp32dev
-        FILES_TO_UPLOAD=""
-        if [ -f "filaman_${VERSION}.bin" ]; then
-          FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_${VERSION}.bin"
-        fi
-        if [ -f "webpage_${VERSION}.bin" ]; then
-          FILES_TO_UPLOAD="$FILES_TO_UPLOAD webpage_${VERSION}.bin"
-        fi
-        if [ -f "filaman_full_${VERSION}.bin" ]; then
-          FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_full_${VERSION}.bin"
-        fi
-        if [ -n "$FILES_TO_UPLOAD" ]; then
-          gh release create "v${VERSION}" --title "Release ${VERSION}" --notes "${{ steps.changelog.outputs.CHANGES }}" $FILES_TO_UPLOAD
-        else
-          echo "Error: No files found to upload"
-          exit 1
 
   gitea-release:
-    needs: [route, verify-provider]
+    needs: route
     if: needs.route.outputs.provider == 'gitea'
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/gitea-release.yml
-    steps:
+    with:
-    - uses: actions/checkout@v4
+      gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }}
-    - name: Set up Python
+      gitea_server_url: ${{ needs.route.outputs.gitea_server_url }}
-      uses: actions/setup-python@v4
+      gitea_repository: ${{ needs.route.outputs.gitea_repository }}
-      with:
+    secrets:
-        python-version: '3.x'
+      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-    - name: Install PlatformIO
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade platformio esptool
-    - name: Install xxd
-      run: |
-        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 }}
-        echo "Building firmware and SPIFFS..."
-        pio run -e esp32dev
-        pio run -t buildfs
-        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin
-        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin
-        (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 0x1000 bootloader.bin 0x8000 partitions.bin 0x10000 firmware.bin 0x390000 spiffs.bin)
-        echo "File sizes:"
-        (cd .pio/build/esp32dev && ls -lh *.bin)
-    - name: Prepare binaries
-      run: |
-        VERSION=${{ steps.get_version.outputs.VERSION }}
-        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
-        echo "File sizes:"
-        cd .pio/build/esp32dev && ls -lh *.bin
-    - 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 Release
-      env:
-        TOKEN: ${{ secrets.GITEA_TOKEN }}
-      run: |
-        API_URL="${{ needs.route.outputs.gitea_server_url }}/api/v1"
-        REPO="${{ needs.route.outputs.gitea_repository }}"
-        VERSION=${{ steps.get_version.outputs.VERSION }}
-        RESPONSE=$(curl -k -s -X POST -H "Authorization: token ${TOKEN}" -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"
-          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
-          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
-        else
-          echo "Failed to create release. Response:"
-          echo "$RESPONSE"
-          exit 1

CHANGELOG.md

@@ -1,5 +1,74 @@
 # Changelog
 
+## [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
+- ci: comment out permissions for GitHub release workflow
+
+
+## [1.3.8] - 2025-02-21
+### Added
+- add Gitea and GitHub release workflows
+
+### Changed
+- update webpages for version v1.3.8
+
+
+## [1.3.7] - 2025-02-21
+### Added
+- add GitHub and Gitea release workflows
+
+### Changed
+- update webpages for version v1.3.7
+
+
+## [1.3.6] - 2025-02-21
+### Changed
+- update webpages for version v1.3.6
+
+### Fixed
+- update GitHub token reference and correct file path in release workflow
+
+
+## [1.3.5] - 2025-02-21
+### Added
+- enhance release workflow to support Gitea alongside GitHub
+
+### Changed
+- update webpages for version v1.3.5
+
+
+## [1.3.4] - 2025-02-21
+### Added
+- add Gitea and GitHub release workflows
+
+### Changed
+- update webpages for version v1.3.4
+- Merge branch 'old'
+
+
+## [1.3.3] - 2025-02-21
+### Changed
+- update webpages for version v1.3.3
+
+### Fixed
+- correct directory path in GitHub workflows for SPIFFS binary
+
+
+## [1.3.2] - 2025-02-21
+### Added
+- add missing conditional exit in release workflow
+
+### Changed
+- update webpages for version v1.3.2
+
+
 ## [1.3.1] - 2025-02-21
 ### Added
 - enhance GitHub and Gitea release workflows with Python setup and binary preparation

platformio.ini

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