docs: update changelog and header for version v1.3.86

.github/workflows/gitea-release.yml

@@ -6,6 +6,15 @@ on:
       GITEA_TOKEN:
         description: 'Token für Gitea API-Zugriff'
         required: true
+      FTP_PASSWORD:
+        description: 'FTP Password for firmware upload'
+        required: true
+      FTP_USER:
+        description: 'FTP User for firmware upload'
+        required: true
+      FTP_HOST:
+        description: 'FTP Host for firmware upload'
+        required: true
 
 jobs:
   create-release:
@@ -72,27 +81,24 @@ jobs:
       id: release_notes
       run: |
         # Get the latest tag
-        LATEST_TAG=$(git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | head -n 1)
+        LATEST_TAG=$(git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | sed -n '2p')
         
         if [ -n "$LATEST_TAG" ]; then
-          # Get the commit hash of the latest tag
-          LAST_RELEASE_HASH=$(git rev-list -n 1 ${LATEST_TAG})
-          
           echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
           echo "Changes since ${LATEST_TAG}:" >> $GITHUB_OUTPUT
           echo "" >> $GITHUB_OUTPUT
           
-          # Get all commits since last release
+          # Get all commits since last release with commit hash and author
           echo "### Added" >> $GITHUB_OUTPUT
-          git log ${LAST_RELEASE_HASH}..HEAD --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
+          git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - (feat|add|new)' | sed 's/^[a-f0-9]* - feat: /- /' >> $GITHUB_OUTPUT || true
           echo "" >> $GITHUB_OUTPUT
           
           echo "### Fixed" >> $GITHUB_OUTPUT
-          git log ${LAST_RELEASE_HASH}..HEAD --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
+          git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - fix' | sed 's/^[a-f0-9]* - fix: /- /' >> $GITHUB_OUTPUT || true
           echo "" >> $GITHUB_OUTPUT
           
           echo "### Changed" >> $GITHUB_OUTPUT
-          git log ${LAST_RELEASE_HASH}..HEAD --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
+          git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -ivE '^[a-f0-9]+ - (feat|fix|add|new)' | sed 's/^[a-f0-9]* - /- /' >> $GITHUB_OUTPUT || true
           echo "EOF" >> $GITHUB_OUTPUT
         else
           # First release
@@ -102,15 +108,15 @@ jobs:
           
           # Add all commits for initial release
           echo "### Added" >> $GITHUB_OUTPUT
-          git log --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
+          git log --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - (feat|add|new)' | sed 's/^[a-f0-9]* - feat: /- /' >> $GITHUB_OUTPUT || true
           echo "" >> $GITHUB_OUTPUT
           
           echo "### Fixed" >> $GITHUB_OUTPUT
-          git log --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
+          git log --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - fix' | sed 's/^[a-f0-9]* - fix: /- /' >> $GITHUB_OUTPUT || true
           echo "" >> $GITHUB_OUTPUT
           
           echo "### Changed" >> $GITHUB_OUTPUT
-          git log --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
+          git log --pretty=format:"%h - %s (%an)" | grep -ivE '^[a-f0-9]+ - (feat|fix|add|new)' | sed 's/^[a-f0-9]* - /- /' >> $GITHUB_OUTPUT || true
           echo "EOF" >> $GITHUB_OUTPUT
         fi
 
@@ -202,3 +208,25 @@ jobs:
             fi
           fi
         done
+
+    - name: Install lftp
+      run: sudo apt-get install -y lftp
+      
+    - name: Upload Firmware via FTP
+      if: success()
+      env:
+        FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
+        FTP_USER: ${{ secrets.FTP_USER }}
+        FTP_HOST: ${{ secrets.FTP_HOST }}
+        VERSION: ${{ steps.get_version.outputs.VERSION }}
+      run: |
+        echo ${{ secrets.FTP_USER }}
+
+        cd .pio/build/esp32dev
+        lftp -c "set ssl:verify-certificate no; \
+                 set ftp:ssl-protect-data true; \
+                 set ftp:ssl-force true; \
+                 set ssl:check-hostname false; \
+                 set ftp:ssl-auth TLS; \
+                 open -u ${{ secrets.FTP_USER }},${{ secrets.FTP_PASSWORD }} ${{ secrets.FTP_HOST }}; \
+                 put -O / filaman_full_${{ steps.get_version.outputs.VERSION }}.bin -o filaman_full.bin"

.github/workflows/github-release.yml

@@ -77,27 +77,24 @@ jobs:
       id: release_notes
       run: |
         # Get the latest tag
-        LATEST_TAG=$(git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | head -n 1)
+        LATEST_TAG=$(git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | sed -n '2p')
         
         if [ -n "$LATEST_TAG" ]; then
-          # Get the commit hash of the latest tag
-          LAST_RELEASE_HASH=$(git rev-list -n 1 ${LATEST_TAG})
-          
           echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
           echo "Changes since ${LATEST_TAG}:" >> $GITHUB_OUTPUT
           echo "" >> $GITHUB_OUTPUT
           
-          # Get all commits since last release
+          # Get all commits since last release with commit hash and author
           echo "### Added" >> $GITHUB_OUTPUT
-          git log ${LAST_RELEASE_HASH}..HEAD --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
+          git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - (feat|add|new)' | sed 's/^[a-f0-9]* - feat: /- /' >> $GITHUB_OUTPUT || true
           echo "" >> $GITHUB_OUTPUT
           
           echo "### Fixed" >> $GITHUB_OUTPUT
-          git log ${LAST_RELEASE_HASH}..HEAD --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
+          git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - fix' | sed 's/^[a-f0-9]* - fix: /- /' >> $GITHUB_OUTPUT || true
           echo "" >> $GITHUB_OUTPUT
           
           echo "### Changed" >> $GITHUB_OUTPUT
-          git log ${LAST_RELEASE_HASH}..HEAD --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
+          git log ${LATEST_TAG}..HEAD --pretty=format:"%h - %s (%an)" | grep -ivE '^[a-f0-9]+ - (feat|fix|add|new)' | sed 's/^[a-f0-9]* - /- /' >> $GITHUB_OUTPUT || true
           echo "EOF" >> $GITHUB_OUTPUT
         else
           # First release
@@ -107,15 +104,15 @@ jobs:
           
           # Add all commits for initial release
           echo "### Added" >> $GITHUB_OUTPUT
-          git log --pretty=format:%s | grep -iE '^(feat|add|new)' | sed 's/^feat: /- /' >> $GITHUB_OUTPUT || true
+          git log --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - (feat|add|new)' | sed 's/^[a-f0-9]* - feat: /- /' >> $GITHUB_OUTPUT || true
           echo "" >> $GITHUB_OUTPUT
           
           echo "### Fixed" >> $GITHUB_OUTPUT
-          git log --pretty=format:%s | grep -iE '^fix' | sed 's/^fix: /- /' >> $GITHUB_OUTPUT || true
+          git log --pretty=format:"%h - %s (%an)" | grep -iE '^[a-f0-9]+ - fix' | sed 's/^[a-f0-9]* - fix: /- /' >> $GITHUB_OUTPUT || true
           echo "" >> $GITHUB_OUTPUT
           
           echo "### Changed" >> $GITHUB_OUTPUT
-          git log --pretty=format:%s | grep -ivE '^(feat|fix|add|new)' | sed 's/^/- /' >> $GITHUB_OUTPUT || true
+          git log --pretty=format:"%h - %s (%an)" | grep -ivE '^[a-f0-9]+ - (feat|fix|add|new)' | sed 's/^[a-f0-9]* - /- /' >> $GITHUB_OUTPUT || true
           echo "EOF" >> $GITHUB_OUTPUT
         fi
 

CHANGELOG.md

@@ -1,5 +1,153 @@
 # Changelog
 
+## [1.3.86] - 2025-02-23
+### Changed
+- update webpages for version v1.3.86
+
+### Fixed
+- streamline FTP credentials usage in Gitea release workflow
+
+
+## [1.3.85] - 2025-02-23
+### Added
+- add FTP_USER variable for Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.85
+
+
+## [1.3.84] - 2025-02-23
+### Added
+- add FTP_HOST variable for firmware upload in Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.84
+
+
+## [1.3.83] - 2025-02-23
+### Changed
+- update webpages for version v1.3.83
+
+### Fixed
+- correct variable interpolation for FTP credentials in Gitea release workflow
+
+
+## [1.3.82] - 2025-02-23
+### Added
+- update Gitea release workflow to use variable interpolation for FTP credentials
+
+### Changed
+- update webpages for version v1.3.82
+
+
+## [1.3.81] - 2025-02-23
+### Added
+- update Gitea release workflow to use environment variables for FTP credentials and version
+
+### Changed
+- update webpages for version v1.3.81
+
+
+## [1.3.80] - 2025-02-23
+### Added
+- add FTP_USER and FTP_PASSWORD secrets for firmware upload in Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.80
+
+
+## [1.3.79] - 2025-02-23
+### Added
+- add FTP_USER input for firmware upload in Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.79
+
+
+## [1.3.78] - 2025-02-23
+### Changed
+- update webpages for version v1.3.78
+
+### Fixed
+- change FTP protocol from FTPS to FTP for file upload in workflow
+
+
+## [1.3.77] - 2025-02-23
+### Changed
+- update webpages for version v1.3.77
+
+### Fixed
+- replace ncftp with lftp for secure firmware upload
+
+
+## [1.3.76] - 2025-02-23
+### Changed
+- update webpages for version v1.3.76
+
+### Fixed
+- replace FTP action with curl for secure firmware upload and install ncftp
+
+
+## [1.3.75] - 2025-02-23
+### Changed
+- update webpages for version v1.3.75
+
+### Fixed
+- update FTP user and enhance SSL options in gitea-release workflow
+
+
+## [1.3.74] - 2025-02-23
+### Changed
+- update webpages for version v1.3.74
+
+### Fixed
+- update password syntax in gitea-release workflow
+
+
+## [1.3.73] - 2025-02-23
+### Changed
+- update webpages for version v1.3.73
+- update version to 1.3.72 in platformio.ini
+
+
+## [1.3.72] - 2025-02-23
+### Changed
+- update webpages for version v1.3.72
+
+### Fixed
+- update FTP options for Gitea release workflow
+
+
+## [1.3.71] - 2025-02-23
+### Added
+- add FTP upload step for firmware in Gitea release workflow
+
+### Changed
+- update webpages for version v1.3.71
+
+
+## [1.3.70] - 2025-02-23
+### Changed
+- update webpages for version v1.3.70
+
+
+## [1.3.69] - 2025-02-23
+### Changed
+- update webpages for version v1.3.69
+
+### Fixed
+- update release note generation to use the second latest tag
+
+
+## [1.3.68] - 2025-02-23
+### Changed
+- update webpages for version v1.3.68
+
+### Fixed
+- update release note generation to include commit hash and author
+- remove commented test line from platformio.ini
+
+
 ## [1.3.67] - 2025-02-23
 ### Changed
 - update webpages for version v1.3.67

platformio.ini

@@ -9,10 +9,8 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.3.67"
-
-#test
-
+version = "1.3.86"
+##
 [env:esp32dev]
 platform = espressif32
 board = esp32dev