Compare commits
	
		
			14 Commits
		
	
	
		
			v1.3.14
			...
			e0c9d90892
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e0c9d90892 | |||
| e5f5d1961b | |||
| 31a960fb9e | |||
| 3c2e75b77a | |||
| 367143c456 | |||
| fbde4b764f | |||
| e57f4216d4 | |||
| b8beb992d6 | |||
| 4234b2254e | |||
| b8faf79163 | |||
| d35afaff46 | |||
| a8a00372b5 | |||
| 72f4eab588 | |||
| afa4eddc00 | 
							
								
								
									
										10
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -34,10 +34,10 @@ jobs: | ||||
|         pio run -t buildfs | ||||
|          | ||||
|         # 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 | ||||
|         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 | ||||
|         (cd .pio/build/esp32dev &&  | ||||
| @@ -78,12 +78,12 @@ jobs: | ||||
|          | ||||
|         # Prepare files for upload | ||||
|         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 | ||||
|             FILES="$FILES -a $file" | ||||
|           fi | ||||
|         done | ||||
|          | ||||
|         # Create release using git command | ||||
|         git tag -a "v${VERSION}" -m "Release ${VERSION}" | ||||
|         git push origin "v${VERSION}" | ||||
|         #git tag -a "v${VERSION}" -m "Release ${VERSION}" | ||||
|         #git push origin "v${VERSION}" | ||||
							
								
								
									
										13
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -67,10 +67,10 @@ jobs: | ||||
|         pio run -t buildfs | ||||
|          | ||||
|         # 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 | ||||
|         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) | ||||
|         (cd .pio/build/esp32dev &&  | ||||
| @@ -115,13 +115,13 @@ jobs: | ||||
|         FILES_TO_UPLOAD="" | ||||
|          | ||||
|         # Always add firmware | ||||
|         if [ -f "filaman_${VERSION}.bin" ]; then | ||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_${VERSION}.bin" | ||||
|         if [ -f "update_filaman_firmware_v${VERSION}.bin" ]; then | ||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_firmware_v${VERSION}.bin" | ||||
|         fi | ||||
|          | ||||
|         # Add SPIFFS and full binary only if they exist | ||||
|         if [ -f "webpage_${VERSION}.bin" ]; then | ||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD webpage_${VERSION}.bin" | ||||
|         if [ -f "update_filaman_website_v${VERSION}.bin" ]; then | ||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin" | ||||
|         fi | ||||
|          | ||||
|         if [ -f "filaman_full_${VERSION}.bin" ]; then | ||||
| @@ -137,3 +137,4 @@ jobs: | ||||
|         else | ||||
|           echo "Error: No files found to upload" | ||||
|           exit 1 | ||||
|         fi | ||||
							
								
								
									
										35
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,40 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## [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 | ||||
|   | ||||
| @@ -9,7 +9,9 @@ | ||||
| ; https://docs.platformio.org/page/projectconf.html | ||||
|  | ||||
| [common] | ||||
| version = "1.3.14" | ||||
| version = "1.3.18" | ||||
|  | ||||
| #test | ||||
|  | ||||
| [env:esp32dev] | ||||
| platform = espressif32 | ||||
|   | ||||
| @@ -122,7 +122,29 @@ def update_changelog(): | ||||
|                 f.write(updated_content) | ||||
|             push_changes(version) | ||||
|         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__": | ||||
|     update_changelog() | ||||
		Reference in New Issue
	
	Block a user