Compare commits
	
		
			6 Commits
		
	
	
		
			v1.2.89
			...
			4477537cec
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 4477537cec | |||
| 44ba7df34f | |||
| 54744a06dd | |||
| cefa81030b | |||
| 62052927d2 | |||
| 933a84f8ce | 
							
								
								
									
										40
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										40
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -46,18 +46,24 @@ jobs: | |||||||
|          |          | ||||||
|     - name: Prepare binaries |     - name: Prepare binaries | ||||||
|       run: | |       run: | | ||||||
|         cd .pio/build/esp32dev |         # Ensure we're in the project root | ||||||
|  |         cd $GITHUB_WORKSPACE | ||||||
|          |          | ||||||
|         # Kopiere die Firmware in den SPIFFS-Build-Ordner |         # Create SPIFFS directory if it doesn't exist | ||||||
|         cp firmware.bin ./spiffs/firmware.bin |         mkdir -p .pio/build/esp32dev/spiffs | ||||||
|          |          | ||||||
|         # Baue das SPIFFS-Image neu mit der eingebetteten Firmware |         # Copy firmware to SPIFFS directory | ||||||
|  |         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/spiffs/firmware.bin | ||||||
|  |          | ||||||
|  |         # Build new SPIFFS image with firmware included | ||||||
|         pio run -t buildfs |         pio run -t buildfs | ||||||
|          |          | ||||||
|         # Erstelle die Release-Dateien |         cd .pio/build/esp32dev | ||||||
|  |          | ||||||
|  |         # Create release files | ||||||
|         cp spiffs.bin filaman_spiffs.bin |         cp spiffs.bin filaman_spiffs.bin | ||||||
|          |          | ||||||
|         # Create full binary with magic byte |         # Create full binary | ||||||
|         echo "Creating full binary..." |         echo "Creating full binary..." | ||||||
|         esptool.py --chip esp32 merge_bin \ |         esptool.py --chip esp32 merge_bin \ | ||||||
|           --fill-flash-size 4MB \ |           --fill-flash-size 4MB \ | ||||||
| @@ -101,14 +107,20 @@ jobs: | |||||||
|            |            | ||||||
|           # Upload binaries |           # Upload binaries | ||||||
|           cd .pio/build/esp32dev |           cd .pio/build/esp32dev | ||||||
|           for file in filaman_ota.bin filaman_spiffs.bin filaman_full.bin; do |            | ||||||
|             echo "Uploading $file..." |           # Check if files exist before uploading | ||||||
|             curl -k -s \ |           for file in filaman_spiffs.bin filaman_full.bin; do | ||||||
|               -X POST \ |             if [ -f "$file" ]; then | ||||||
|               -H "Authorization: token ${TOKEN}" \ |               echo "Uploading $file..." | ||||||
|               -H "Content-Type: application/octet-stream" \ |               curl -k -s \ | ||||||
|               --data-binary "@$file" \ |                 -X POST \ | ||||||
|               "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file" |                 -H "Authorization: token ${TOKEN}" \ | ||||||
|  |                 -H "Content-Type: application/octet-stream" \ | ||||||
|  |                 --data-binary "@$file" \ | ||||||
|  |                 "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file" | ||||||
|  |             else | ||||||
|  |               echo "Warning: $file not found" | ||||||
|  |             fi | ||||||
|           done |           done | ||||||
|         else |         else | ||||||
|           echo "Failed to create release. Response:" |           echo "Failed to create release. Response:" | ||||||
|   | |||||||
							
								
								
									
										42
									
								
								.github/workflows/providers/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										42
									
								
								.github/workflows/providers/github-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -35,18 +35,24 @@ jobs: | |||||||
|          |          | ||||||
|     - name: Prepare binaries |     - name: Prepare binaries | ||||||
|       run: | |       run: | | ||||||
|         cd .pio/build/esp32dev |         # Ensure we're in the project root | ||||||
|  |         cd $GITHUB_WORKSPACE | ||||||
|          |          | ||||||
|         # Kopiere die Firmware in den SPIFFS-Build-Ordner |         # Create SPIFFS directory if it doesn't exist | ||||||
|         cp firmware.bin ./spiffs/firmware.bin |         mkdir -p .pio/build/esp32dev/spiffs | ||||||
|          |          | ||||||
|         # Baue das SPIFFS-Image neu mit der eingebetteten Firmware |         # Copy firmware to SPIFFS directory | ||||||
|  |         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/spiffs/firmware.bin | ||||||
|  |          | ||||||
|  |         # Build new SPIFFS image with firmware included | ||||||
|         pio run -t buildfs |         pio run -t buildfs | ||||||
|          |          | ||||||
|         # Erstelle die Release-Dateien |         cd .pio/build/esp32dev | ||||||
|  |          | ||||||
|  |         # Create release files | ||||||
|         cp spiffs.bin filaman_spiffs.bin |         cp spiffs.bin filaman_spiffs.bin | ||||||
|          |          | ||||||
|         # Create full binary with magic byte |         # Create full binary | ||||||
|         echo "Creating full binary..." |         echo "Creating full binary..." | ||||||
|         esptool.py --chip esp32 merge_bin \ |         esptool.py --chip esp32 merge_bin \ | ||||||
|           --fill-flash-size 4MB \ |           --fill-flash-size 4MB \ | ||||||
| @@ -81,7 +87,23 @@ jobs: | |||||||
|       env: |       env: | ||||||
|         GH_TOKEN: ${{ github.token }} |         GH_TOKEN: ${{ github.token }} | ||||||
|       run: | |       run: | | ||||||
|         gh release create "${{ github.ref_name }}" \ |         # Check which files exist and create a list for upload | ||||||
|           --title "Release ${{ steps.get_version.outputs.VERSION }}" \ |         cd .pio/build/esp32dev | ||||||
|           --notes "${{ steps.changelog.outputs.CHANGES }}" \ |         FILES_TO_UPLOAD="" | ||||||
|           .pio/build/esp32dev/filaman_full.bin |         for file in filaman_spiffs.bin filaman_full.bin; do | ||||||
|  |           if [ -f "$file" ]; then | ||||||
|  |             FILES_TO_UPLOAD="$FILES_TO_UPLOAD .pio/build/esp32dev/$file" | ||||||
|  |           else | ||||||
|  |             echo "Warning: $file not found" | ||||||
|  |           fi | ||||||
|  |         done | ||||||
|  |          | ||||||
|  |         # Create release with available files | ||||||
|  |         if [ -n "$FILES_TO_UPLOAD" ]; then | ||||||
|  |           gh release create "${{ github.ref_name }}" \ | ||||||
|  |             --title "Release ${{ steps.get_version.outputs.VERSION }}" \ | ||||||
|  |             --notes "${{ steps.changelog.outputs.CHANGES }}" \ | ||||||
|  |             $FILES_TO_UPLOAD | ||||||
|  |         else | ||||||
|  |           echo "Error: No files found to upload" | ||||||
|  |           exit 1 | ||||||
							
								
								
									
										14
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,19 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## [1.2.91] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - add file existence checks before uploading binaries in release workflows | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.91 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.90] - 2025-02-20 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.90 | ||||||
|  | - update Gitea and GitHub release workflows to include SPIFFS directory creation and firmware copying | ||||||
|  |  | ||||||
|  |  | ||||||
| ## [1.2.89] - 2025-02-20 | ## [1.2.89] - 2025-02-20 | ||||||
| ### Changed | ### Changed | ||||||
| - update webpages for version v1.2.89 | - update webpages for version v1.2.89 | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.89</span></h1> |                 <h1>FilaMan<span class="version">v1.2.91</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.89</span></h1> |                 <h1>FilaMan<span class="version">v1.2.91</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.89</span></h1> |                 <h1>FilaMan<span class="version">v1.2.91</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.89</span></h1> |                 <h1>FilaMan<span class="version">v1.2.91</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.89</span></h1> |                 <h1>FilaMan<span class="version">v1.2.91</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.89</span></h1> |                 <h1>FilaMan<span class="version">v1.2.91</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.89</span></h1> |                 <h1>FilaMan<span class="version">v1.2.91</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ | |||||||
| ; https://docs.platformio.org/page/projectconf.html | ; https://docs.platformio.org/page/projectconf.html | ||||||
|  |  | ||||||
| [common] | [common] | ||||||
| version = "1.2.89" | version = "1.2.91" | ||||||
|  |  | ||||||
| [env:esp32dev] | [env:esp32dev] | ||||||
| platform = espressif32 | platform = espressif32 | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user