Compare commits
	
		
			10 Commits
		
	
	
		
			v1.3.14
			...
			367143c456
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 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}" | ||||
							
								
								
									
										15
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								.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 | ||||
| @@ -136,4 +136,5 @@ jobs: | ||||
|             $FILES_TO_UPLOAD | ||||
|         else | ||||
|           echo "Error: No files found to upload" | ||||
|           exit 1 | ||||
|           exit 1 | ||||
|         fi | ||||
							
								
								
									
										20
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,25 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## [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.17" | ||||
|  | ||||
| #test | ||||
|  | ||||
| [env:esp32dev] | ||||
| platform = espressif32 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user