docs: update changelog for version 1.2.9

feat: update version to 1.2.9 in platformio.ini
feat: refactor GitHub and Gitea release workflows for improved version handling and firmware uploads
2025-02-18 23:20:06 +01:00 · 2025-02-18 23:20:03 +01:00 · 2025-02-18 23:14:52 +01:00 · 2025-02-18 22:32:11 +01:00 · 2025-02-18 22:32:07 +01:00 · 2025-02-18 22:28:31 +01:00
12 changed files with 343 additions and 81 deletions
--- a/.github/workflows/providers/gitea-release.yml
+++ b/.github/workflows/providers/gitea-release.yml
@ -0,0 +1,101 @@
+name: Gitea Release
+
+on:
+  workflow_call:  # This workflow will only be triggered when called by another workflow
+
+permissions:
+  contents: write      # Required for creating releases
+  issues: read        # Required for reading changelog
+  pull-requests: read # Required for reading changelog
+
+jobs:
+  build:
+    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
+    
+    - 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: |
+        CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.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:
+        GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+        GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
+        GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
+      run: |
+        # Create release using Gitea API
+        RESPONSE=$(curl -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/json" \
+        -H "accept: application/json" \
+        "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
+        -d '{
+            "tag_name": "${{ github.ref_name }}",
+            "name": "Release ${{ steps.get_version.outputs.VERSION }}",
+            "body": "${{ steps.changelog.outputs.CHANGES }}",
+            "draft": false,
+            "prerelease": false
+        }')
+        
+        # Extract release ID from response
+        RELEASE_ID=$(echo $RESPONSE | jq -r .id)
+        
+        # Upload full firmware
+        curl -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/octet-stream" \
+        "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_full.bin" \
+        --data-binary @.pio/build/esp32dev/filaman_full.bin
+        
+        # Upload OTA firmware
+        curl -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/octet-stream" \
+        "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_ota.bin" \
+        --data-binary @.pio/build/esp32dev/filaman_ota.bin
--- a/.github/workflows/providers/github-release.yml
+++ b/.github/workflows/providers/github-release.yml
@ -0,0 +1,83 @@
+name: GitHub Release
+
+on:
+  workflow_call:  # This workflow will only be triggered when called by another workflow
+
+permissions:
+  contents: write      # Required for creating releases
+  issues: read        # Required for reading changelog
+  pull-requests: read # Required for reading changelog
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write # Required for creating releases at job level
+    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
+    
+    - 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: |
+        # Use PlatformIO to create a proper OTA image
+        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: |
+        CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        echo "EOF" >> $GITHUB_OUTPUT
+    
+    - name: Install and Configure GitHub CLI
+      run: |
+        curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
+        && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
+        && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+        && sudo apt update \
+        && sudo apt install gh -y
+        
+    - name: Create Release with GitHub CLI
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh release create "${{ github.ref_name }}" \
+          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
+          --notes "${{ steps.changelog.outputs.CHANGES }}" \
+          ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
+          ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,20 +1,13 @@
-name: Create Release
+name: Release

 on:
  push:
    tags:
      - 'v*'

-permissions:
-  contents: write      # Required for creating releases
-  issues: read        # Required for reading changelog
-  pull-requests: read # Required for reading changelog
-
 jobs:
-  build:
+  release:
    runs-on: ubuntu-latest
-    permissions:
-      contents: write # Required for creating releases at job level
    steps:
      - uses: actions/checkout@v4
      
@ -51,7 +44,6 @@ jobs:

      - name: Prepare OTA firmware
        run: |
-        # Use PlatformIO to create a proper OTA image
          cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
      
      - name: Get version from tag
@ -66,20 +58,74 @@ jobs:
          echo "$CHANGELOG" >> $GITHUB_OUTPUT
          echo "EOF" >> $GITHUB_OUTPUT

-    - name: Install and Configure GitHub CLI
-      run: |
-        curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
-        && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
-        && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
-        && sudo apt update \
-        && sudo apt install gh -y
+      - name: Install jq
+        if: ${{ github.server_url != 'https://github.com' }}
+        run: sudo apt-get install -y jq

-    - name: Create Release with GitHub CLI
+      - name: Determine and run release process
        env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          GITEA_API_URL: ${{ secrets.GITEA_API_URL }}
+          GITEA_REPOSITORY: ${{ secrets.GITEA_REPOSITORY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
-        gh release create "${{ github.ref_name }}" \
-          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
-          --notes "${{ steps.changelog.outputs.CHANGES }}" \
-          ".pio/build/esp32dev/filaman_full.bin#filaman_full.bin" \
-          ".pio/build/esp32dev/filaman_ota.bin#filaman_ota.bin"
+          if [[ "$GITHUB_SERVER_URL" == "https://github.com" ]]; then
+            echo "Creating GitHub Release..."
+            curl -X POST \
+              -H "Authorization: token ${GITHUB_TOKEN}" \
+              -H "Accept: application/vnd.github.v3+json" \
+              https://api.github.com/repos/${{ github.repository }}/releases \
+              -d '{
+                "tag_name": "${{ github.ref_name }}",
+                "name": "Release ${{ steps.get_version.outputs.VERSION }}",
+                "body": "${{ steps.changelog.outputs.CHANGES }}",
+                "draft": false,
+                "prerelease": false
+              }' > release.json
+            
+            UPLOAD_URL=$(jq -r .upload_url release.json | sed 's/{?name,label}//')
+            
+            # Upload full firmware
+            curl -X POST \
+              -H "Authorization: token ${GITHUB_TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              "${UPLOAD_URL}?name=filaman_full.bin" \
+              --data-binary @.pio/build/esp32dev/filaman_full.bin
+            
+            # Upload OTA firmware
+            curl -X POST \
+              -H "Authorization: token ${GITHUB_TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              "${UPLOAD_URL}?name=filaman_ota.bin" \
+              --data-binary @.pio/build/esp32dev/filaman_ota.bin
+          else
+            echo "Creating Gitea Release..."
+            RESPONSE=$(curl -X POST \
+              -H "Authorization: token ${GITEA_TOKEN}" \
+              -H "Content-Type: application/json" \
+              -H "accept: application/json" \
+              "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases" \
+              -d '{
+                "tag_name": "${{ github.ref_name }}",
+                "name": "Release ${{ steps.get_version.outputs.VERSION }}",
+                "body": "${{ steps.changelog.outputs.CHANGES }}",
+                "draft": false,
+                "prerelease": false
+              }')
+            
+            RELEASE_ID=$(echo $RESPONSE | jq -r .id)
+            
+            # Upload full firmware
+            curl -X POST \
+              -H "Authorization: token ${GITEA_TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_full.bin" \
+              --data-binary @.pio/build/esp32dev/filaman_full.bin
+            
+            # Upload OTA firmware
+            curl -X POST \
+              -H "Authorization: token ${GITEA_TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              "${GITEA_API_URL}/repos/${GITEA_REPOSITORY}/releases/${RELEASE_ID}/assets?name=filaman_ota.bin" \
+              --data-binary @.pio/build/esp32dev/filaman_ota.bin
+          fi
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,37 @@
 # Changelog

+## [1.2.9] - 2025-02-18
+### Added
+- update version to 1.2.9 in platformio.ini
+- refactor GitHub and Gitea release workflows for improved version handling and firmware uploads
+
+
+## [1.2.8] - 2025-02-18
+### Added
+- update version to 1.2.8 in platformio.ini; refactor Gitea and GitHub release workflows
+- update version to 1.2.7 in platformio.ini; adjust Gitea release workflow
+
+
+## [1.2.6] - 2025-02-18
+### Added
+- update version to 1.2.6 in platformio.ini
+- update version to 1.2.5; enhance Gitea release workflow and streamline release process
+
+### Changed
+- update changelog for version 1.2.5
+
+
+## [1.2.5] - 2025-02-18
+### Added
+- update version to 1.2.5; enhance Gitea release workflow and streamline release process
+
+
+## [1.2.4] - 2025-02-18
+### Added
+- update version to 1.2.4 in HTML files and platformio.ini
+- add GitHub and Gitea release workflows; streamline firmware release process
+
+
 ## [1.2.3] - 2025-02-18
 ### Added
 - update version to 1.2.3; modify HTML files to reflect new version; enhance firmware update process and UI improvements
--- a/html/header.html
+++ b/html/header.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/index.html
+++ b/html/index.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/rfid.html
+++ b/html/rfid.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/spoolman.html
+++ b/html/spoolman.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/upgrade.html
+++ b/html/upgrade.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/waage.html
+++ b/html/waage.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/wifi.html
+++ b/html/wifi.html
@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.2</span></h1>
+                <h1>FilaMan<span class="version">v1.2.4</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/platformio.ini
+++ b/platformio.ini
@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.2.3"
+version = "1.2.9"

 [env:esp32dev]
 platform = espressif32
Author	SHA1	Message	Date
Manuel Weiser	9eb64e06f0	docs: update changelog for version 1.2.9 Some checks failed Release / release (push) Failing after 2m37s Details	2025-02-18 23:20:06 +01:00
Manuel Weiser	693ef4e26c	feat: update version to 1.2.9 in platformio.ini	2025-02-18 23:20:03 +01:00
Manuel Weiser	11c099eba2	feat: refactor GitHub and Gitea release workflows for improved version handling and firmware uploads	2025-02-18 23:14:52 +01:00
Manuel Weiser	c7c122a505	docs: update changelog for version 1.2.8 Some checks failed GitHub Release / build (push) Has been cancelled Details Release / detect (push) Successful in 7s Details Release / gitea-release (push) Failing after 2m22s Details Release / github-release (push) Has been skipped Details	2025-02-18 22:32:11 +01:00
Manuel Weiser	d1bb4b7c83	feat: update version to 1.2.8 in platformio.ini; refactor Gitea and GitHub release workflows	2025-02-18 22:32:07 +01:00
Manuel Weiser	dc5118587c	feat: update version to 1.2.7 in platformio.ini; adjust Gitea release workflow	2025-02-18 22:28:31 +01:00
Manuel Weiser	b13f2c4eee	docs: update changelog for version 1.2.6 Some checks failed Gitea Release / build (push) Failing after 0s Details GitHub Release / build (push) Failing after 2m41s Details Release / detect-and-run (push) Failing after 17s Details	2025-02-18 22:23:50 +01:00
Manuel Weiser	6d16c35e62	feat: update version to 1.2.6 in platformio.ini	2025-02-18 22:23:45 +01:00
Manuel Weiser	c94ebf5e33	docs: update changelog for version 1.2.5	2025-02-18 22:18:51 +01:00
Manuel Weiser	9203706a20	feat: update version to 1.2.5; enhance Gitea release workflow and streamline release process	2025-02-18 22:18:49 +01:00
Manuel Weiser	c252f48a49	docs: update changelog for version 1.2.4 Some checks failed GitHub Release / build (push) Has been cancelled Details Release / detect-and-run (push) Failing after 0s Details Gitea Release / build (push) Failing after 2m48s Details	2025-02-18 21:56:09 +01:00
Manuel Weiser	228dcacb1e	feat: update version to 1.2.4 in HTML files and platformio.ini	2025-02-18 21:56:05 +01:00
Manuel Weiser	9de4ed9ee9	feat: add GitHub and Gitea release workflows; streamline firmware release process	2025-02-18 21:53:23 +01:00