Compare commits
	
		
			29 Commits
		
	
	
		
			v1.3.11
			...
			982bb5aa21
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 982bb5aa21 | |||
| 007737db13 | |||
| 17e5949201 | |||
| 6a57186091 | |||
| babd3f47a0 | |||
| 5372fe10fe | |||
| e0c9d90892 | |||
| e5f5d1961b | |||
| 31a960fb9e | |||
| 3c2e75b77a | |||
| 367143c456 | |||
| fbde4b764f | |||
| e57f4216d4 | |||
| b8beb992d6 | |||
| 4234b2254e | |||
| b8faf79163 | |||
| d35afaff46 | |||
| a8a00372b5 | |||
| 72f4eab588 | |||
| afa4eddc00 | |||
| b0888e7e63 | |||
| 238a84a8a2 | |||
| 59cc00ca13 | |||
| ab083f5f57 | |||
| c111573206 | |||
| 52b2494e52 | |||
| 069ec2d7a1 | |||
| 94e35ae86e | |||
| d71e3d8184 | 
							
								
								
									
										6
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							@@ -34,10 +34,10 @@ jobs:
 | 
				
			|||||||
        pio run -t buildfs
 | 
					        pio run -t buildfs
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Copy firmware binary
 | 
					        # 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
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # 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
 | 
					        # Create full binary
 | 
				
			||||||
        (cd .pio/build/esp32dev && 
 | 
					        (cd .pio/build/esp32dev && 
 | 
				
			||||||
@@ -78,7 +78,7 @@ jobs:
 | 
				
			|||||||
        
 | 
					        
 | 
				
			||||||
        # Prepare files for upload
 | 
					        # Prepare files for upload
 | 
				
			||||||
        FILES=""
 | 
					        FILES=""
 | 
				
			||||||
        for file in filaman_${VERSION}.bin webpage_${VERSION}.bin filaman_full_${VERSION}.bin; do
 | 
					        for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${VERSION}.bin filaman_full_${VERSION}.bin; do
 | 
				
			||||||
          if [ -f "$file" ]; then
 | 
					          if [ -f "$file" ]; then
 | 
				
			||||||
            FILES="$FILES -a $file"
 | 
					            FILES="$FILES -a $file"
 | 
				
			||||||
          fi
 | 
					          fi
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										29
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										29
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							@@ -2,14 +2,23 @@ name: GitHub Release
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
on:
 | 
					on:
 | 
				
			||||||
  workflow_call:
 | 
					  workflow_call:
 | 
				
			||||||
 | 
					    secrets:
 | 
				
			||||||
 | 
					      RELEASE_TOKEN:
 | 
				
			||||||
 | 
					        description: 'GitHub token for release creation'
 | 
				
			||||||
 | 
					        required: true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					permissions:
 | 
				
			||||||
 | 
					  contents: write
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  create-release:
 | 
					  create-release:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    #permissions:
 | 
					    permissions:
 | 
				
			||||||
    #  contents: write
 | 
					      contents: write
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v4
 | 
					    - uses: actions/checkout@v4
 | 
				
			||||||
 | 
					      with:
 | 
				
			||||||
 | 
					        fetch-depth: 0
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    - name: Set up Python
 | 
					    - name: Set up Python
 | 
				
			||||||
      uses: actions/setup-python@v4
 | 
					      uses: actions/setup-python@v4
 | 
				
			||||||
@@ -58,10 +67,10 @@ jobs:
 | 
				
			|||||||
        pio run -t buildfs
 | 
					        pio run -t buildfs
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Copy firmware binary
 | 
					        # 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
 | 
					        # 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)
 | 
					        # Create full binary (always)
 | 
				
			||||||
        (cd .pio/build/esp32dev && 
 | 
					        (cd .pio/build/esp32dev && 
 | 
				
			||||||
@@ -97,22 +106,22 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    - name: Create GitHub Release
 | 
					    - name: Create GitHub Release
 | 
				
			||||||
      env:
 | 
					      env:
 | 
				
			||||||
        GH_TOKEN: ${{ github.token }}
 | 
					        GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        VERSION=${{ steps.get_version.outputs.VERSION }}
 | 
					        VERSION=${{ steps.get_version.outputs.VERSION }}
 | 
				
			||||||
 | 
					        cd .pio/build/esp32dev
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Create release with available files
 | 
					        # Create release with available files
 | 
				
			||||||
        cd .pio/build/esp32dev
 | 
					 | 
				
			||||||
        FILES_TO_UPLOAD=""
 | 
					        FILES_TO_UPLOAD=""
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Always add firmware
 | 
					        # 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
 | 
					        fi
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Add SPIFFS and full binary only if they exist
 | 
					        # 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
 | 
					        fi
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        if [ -f "filaman_full_${VERSION}.bin" ]; then
 | 
					        if [ -f "filaman_full_${VERSION}.bin" ]; then
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										7
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							@@ -5,6 +5,9 @@ on:
 | 
				
			|||||||
    tags:
 | 
					    tags:
 | 
				
			||||||
      - 'v*'
 | 
					      - 'v*'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					permissions:
 | 
				
			||||||
 | 
					  contents: write
 | 
				
			||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  detect-provider:
 | 
					  detect-provider:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
@@ -23,8 +26,12 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  github-release:
 | 
					  github-release:
 | 
				
			||||||
    needs: detect-provider
 | 
					    needs: detect-provider
 | 
				
			||||||
 | 
					    permissions:
 | 
				
			||||||
 | 
					      contents: write
 | 
				
			||||||
    if: needs.detect-provider.outputs.provider == 'github'
 | 
					    if: needs.detect-provider.outputs.provider == 'github'
 | 
				
			||||||
    uses: ./.github/workflows/github-release.yml
 | 
					    uses: ./.github/workflows/github-release.yml
 | 
				
			||||||
 | 
					    secrets:
 | 
				
			||||||
 | 
					      RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  gitea-release:
 | 
					  gitea-release:
 | 
				
			||||||
    needs: detect-provider
 | 
					    needs: detect-provider
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										65
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										65
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,5 +1,70 @@
 | 
				
			|||||||
# Changelog
 | 
					# Changelog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.20] - 2025-02-21
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.20
 | 
				
			||||||
 | 
					- workflow: enable git tagging and pushing for Gitea releases
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.19] - 2025-02-21
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.19
 | 
				
			||||||
 | 
					- workflow: enable git push for version tagging in Gitea release
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.18] - 2025-02-21
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- ACHTUNG: Installiere einmal das filaman_full.bin danach kannst du über die upgrade Files aktualisieren und deine Settings bleiben auch erhalten.
 | 
				
			||||||
 | 
					- ATTENTION: Install the filaman_full.bin once, then you can update via the upgrade files and your settings will also be retained.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [1.3.18] - 2025-02-21
 | 
				
			||||||
 | 
					### Added
 | 
				
			||||||
 | 
					- add note about filaman_full.bin installation in changelog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					- update webpages for version v1.3.18
 | 
				
			||||||
 | 
					- update changelog for version 1.3.18 and enhance update script for existing entries
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [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
 | 
					## [1.3.11] - 2025-02-21
 | 
				
			||||||
### Changed
 | 
					### Changed
 | 
				
			||||||
- update webpages for version v1.3.11
 | 
					- update webpages for version v1.3.11
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,7 +9,9 @@
 | 
				
			|||||||
; https://docs.platformio.org/page/projectconf.html
 | 
					; https://docs.platformio.org/page/projectconf.html
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[common]
 | 
					[common]
 | 
				
			||||||
version = "1.3.11"
 | 
					version = "1.3.20"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#test
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[env:esp32dev]
 | 
					[env:esp32dev]
 | 
				
			||||||
platform = espressif32
 | 
					platform = espressif32
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -122,7 +122,29 @@ def update_changelog():
 | 
				
			|||||||
                f.write(updated_content)
 | 
					                f.write(updated_content)
 | 
				
			||||||
            push_changes(version)
 | 
					            push_changes(version)
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
            print(f"Version {version} already exists in changelog")
 | 
					            # Version existiert bereits, füge neue Einträge unter der existierenden Version ein
 | 
				
			||||||
 | 
					            version_pattern = f"## \\[{version}\\] - \\d{{4}}-\\d{{2}}-\\d{{2}}"
 | 
				
			||||||
 | 
					            next_version_pattern = "## \\[.*?\\] - \\d{4}-\\d{2}-\\d{2}"
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
 | 
					            # Finde den Start der aktuellen Version
 | 
				
			||||||
 | 
					            version_match = re.search(version_pattern, content)
 | 
				
			||||||
 | 
					            if version_match:
 | 
				
			||||||
 | 
					                version_start = version_match.end()
 | 
				
			||||||
 | 
					                # Suche nach der nächsten Version
 | 
				
			||||||
 | 
					                next_version_match = re.search(next_version_pattern, content[version_start:])
 | 
				
			||||||
 | 
					                
 | 
				
			||||||
 | 
					                if next_version_match:
 | 
				
			||||||
 | 
					                    # Füge zwischen aktueller und nächster Version ein
 | 
				
			||||||
 | 
					                    insert_pos = version_start + next_version_match.start()
 | 
				
			||||||
 | 
					                    updated_content = content[:insert_pos] + "\n" + changelog_entry + content[insert_pos:]
 | 
				
			||||||
 | 
					                else:
 | 
				
			||||||
 | 
					                    # Füge am Ende des Abschnitts ein
 | 
				
			||||||
 | 
					                    updated_content = content[:version_start] + "\n" + changelog_entry + content[version_start:]
 | 
				
			||||||
 | 
					                
 | 
				
			||||||
 | 
					                with open(changelog_path, 'w') as f:
 | 
				
			||||||
 | 
					                    f.write(updated_content)
 | 
				
			||||||
 | 
					                push_changes(version)
 | 
				
			||||||
 | 
					                print(f"Added new entries to existing version {version}")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if __name__ == "__main__":
 | 
					if __name__ == "__main__":
 | 
				
			||||||
    update_changelog()
 | 
					    update_changelog()
 | 
				
			||||||
		Reference in New Issue
	
	Block a user