docs: update changelog for version 1.3.6

docs: update webpages for version v1.3.6
fix: update GitHub token reference and correct file path in release workflow
2025-02-21 20:45:33 +01:00 · 2025-02-21 20:45:33 +01:00 · 2025-02-21 20:45:25 +01:00 · 2025-02-21 20:22:03 +01:00 · 2025-02-21 20:22:03 +01:00 · 2025-02-21 20:21:57 +01:00
5 changed files with 269 additions and 21 deletions
--- a/.github/workflows/providers/gitea-release.yml
+++ b/.github/workflows/providers/gitea-release.yml
@ -79,15 +79,15 @@ jobs:
        
        # Create full binary (always)
        (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 
+        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)
        
        # Verify file sizes
--- a/.github/workflows/providers/github-release.yml
+++ b/.github/workflows/providers/github-release.yml
@ -61,17 +61,17 @@ 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 && \
+        (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 \
+          0x1000 bootloader.bin \
          0x8000 partitions.bin \
          0x10000 firmware.bin \
          0x390000 spiffs.bin)
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -56,15 +56,201 @@ jobs:
  github-release:
    needs: [route, verify-provider]
    if: needs.route.outputs.provider == 'github'
-    uses: ./.github/workflows/providers/github-release.yml
+    runs-on: ubuntu-latest
+    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: ${{ secrets.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
+          if [ "${{ needs.route.outputs.provider }}" = "github" ]; then
+            gh release create "v${VERSION}" --title "Release ${VERSION}" --notes "${{ steps.changelog.outputs.CHANGES }}" $FILES_TO_UPLOAD
+          elif [ "${{ needs.route.outputs.provider }}" = "gitea" ]; then
+            API_URL="${{ needs.route.outputs.gitea_server_url }}/api/v1"
+            REPO="${{ needs.route.outputs.gitea_repository }}"
+            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 $FILES_TO_UPLOAD; do
+                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"
+              done
+            else
+              echo "Failed to create release. Response:"
+              echo "$RESPONSE"
+              exit 1
+            fi
+          else
+            echo "Error: Unknown provider"
+            exit 1
+          fi
+        else
+          echo "Error: No files found to upload"
+          exit 1

  gitea-release:
    needs: [route, verify-provider]
    if: needs.route.outputs.provider == 'gitea'
-    uses: ./.github/workflows/providers/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 }}
+    runs-on: ubuntu-latest
+    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 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
+      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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,67 @@
 # Changelog

+## [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
+
+### Changed
+- update webpages for version v1.3.1
+
+
+## [1.3.0] - 2025-02-21
+### Changed
+- bump version to 1.3.0 in platformio.ini
+
+
+## [1.2.102] - 2025-02-21
+### Changed
+- update webpages for version v1.2.102
+
+### Fixed
+- adjust bootloader offset in binary merge for Gitea and GitHub workflows
+
+
 ## [1.2.101] - 2025-02-21
 ### Changed
 - update webpages for version v1.2.101
--- a/platformio.ini
+++ b/platformio.ini
@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.2.101"
+version = "1.3.6"

 [env:esp32dev]
 platform = espressif32
Author	SHA1	Message	Date
Manuel Weiser	8d003295e7	docs: update changelog for version 1.3.6 Some checks failed Release Workflow / route (push) Successful in 7s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m46s Details	2025-02-21 20:45:33 +01:00
Manuel Weiser	f89500946a	docs: update webpages for version v1.3.6	2025-02-21 20:45:33 +01:00
Manuel Weiser	14e745ff06	fix: update GitHub token reference and correct file path in release workflow	2025-02-21 20:45:25 +01:00
Manuel Weiser	d058397fa2	docs: update changelog for version 1.3.5 Some checks failed Release Workflow / route (push) Successful in 6s Details Release Workflow / verify-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m24s Details	2025-02-21 20:22:03 +01:00
Manuel Weiser	622f5403a7	docs: update webpages for version v1.3.5	2025-02-21 20:22:03 +01:00
Manuel Weiser	92b78a86dd	feat: enhance release workflow to support Gitea alongside GitHub	2025-02-21 20:21:57 +01:00
Manuel Weiser	ec399390e8	docs: update changelog for version 1.3.4 Some checks failed Release Workflow / route (push) Successful in 7s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m22s Details	2025-02-21 20:04:05 +01:00
Manuel Weiser	909c4e9b5e	docs: update webpages for version v1.3.4	2025-02-21 20:04:05 +01:00
Manuel Weiser	f4b20bfffd	Merge branch 'old'	2025-02-21 20:03:45 +01:00
Manuel Weiser	78464215a9	feat: add Gitea and GitHub release workflows	2025-02-21 20:03:21 +01:00
Manuel Weiser	4365f0463a	docs: update changelog for version 1.3.3 Some checks failed Release Workflow / route (push) Successful in 7s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m42s Details	2025-02-21 19:48:48 +01:00
Manuel Weiser	727bc0e760	docs: update webpages for version v1.3.3	2025-02-21 19:48:48 +01:00
Manuel Weiser	04604013eb	fix: correct directory path in GitHub workflows for SPIFFS binary	2025-02-21 19:48:45 +01:00
Manuel Weiser	cf5fc5f6f1	docs: update changelog for version 1.3.2 Some checks failed Release Workflow / route (push) Successful in 6s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Failing after 2m35s Details	2025-02-21 19:33:26 +01:00
Manuel Weiser	945a4ccce6	docs: update webpages for version v1.3.2	2025-02-21 19:33:26 +01:00
Manuel Weiser	7cf9e2d145	fix: add missing conditional exit in release workflow	2025-02-21 19:33:24 +01:00
Manuel Weiser	9db4e338ea	docs: update changelog for version 1.3.1 Some checks failed Release Workflow / route (push) Successful in 6s Details Release Workflow / verify-provider (push) Failing after 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Has been skipped Details	2025-02-21 19:10:52 +01:00
Manuel Weiser	dea6ca2c66	docs: update webpages for version v1.3.1	2025-02-21 19:10:52 +01:00
Manuel Weiser	e224e72e41	feat: enhance GitHub and Gitea release workflows with Python setup and binary preparation	2025-02-21 19:10:48 +01:00
Manuel Weiser	306c517da7	docs: update changelog for version 1.3.0 All checks were successful Release Workflow / route (push) Successful in 6s Details Release Workflow / verify-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 2m40s Details	2025-02-21 18:58:35 +01:00
Manuel Weiser	0337bbabe0	bump version to 1.3.0 in platformio.ini	2025-02-21 18:58:32 +01:00
Manuel Weiser	bde14e50e0	docs: update changelog for version 1.2.102 All checks were successful Release Workflow / route (push) Successful in 7s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 3m1s Details	2025-02-21 18:28:20 +01:00
Manuel Weiser	9c656a9bd0	docs: update webpages for version v1.2.102	2025-02-21 18:28:20 +01:00
Manuel Weiser	eae552017d	fix: adjust bootloader offset in binary merge for Gitea and GitHub workflows	2025-02-21 18:28:16 +01:00