Compare commits
	
		
			28 Commits
		
	
	
		
			v1.2.45
			...
			34ee9badea
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 34ee9badea | |||
| 6594af9540 | |||
| c21bd2d4ec | |||
| e5f895b560 | |||
| bb0f50ce1d | |||
| 499a08aa75 | |||
| 745d960f62 | |||
| 531d0fe9a2 | |||
| 2af23e8084 | |||
| cd204fdaa8 | |||
| d04ad42b5b | |||
| 8d80a8fb5a | |||
| 77032bf9ae | |||
| 3967366ae6 | |||
| cd391378c2 | |||
| 3fc3a689cb | |||
| bd5b32a3b0 | |||
| a5c999234c | |||
| f64d3e51ce | |||
| a650b7d860 | |||
| 14e98072aa | |||
| 0bc4c0565f | |||
| 4aa8e844ac | |||
| d7135fddc8 | |||
| 6e3e978839 | |||
| 33b0e79c18 | |||
| 787d878e83 | |||
| 1e24179b82 | 
							
								
								
									
										87
									
								
								.github/workflows/providers/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										87
									
								
								.github/workflows/providers/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -1,87 +0,0 @@ | ||||
| name: Build Firmware | ||||
|  | ||||
| on: | ||||
|   workflow_call: | ||||
|     outputs: | ||||
|       version: | ||||
|         description: "The version from the tag" | ||||
|         value: ${{ jobs.build.outputs.version }} | ||||
|       changelog: | ||||
|         description: "The changelog for the current version" | ||||
|         value: ${{ jobs.build.outputs.changelog }} | ||||
|  | ||||
| jobs: | ||||
|   build: | ||||
|     runs-on: ubuntu-latest | ||||
|     outputs: | ||||
|       version: ${{ steps.get_version.outputs.VERSION }} | ||||
|       changelog: ${{ steps.changelog.outputs.CHANGES }} | ||||
|     steps: | ||||
|     - uses: actions/checkout@v4 | ||||
|      | ||||
|     - name: Set up Python | ||||
|       uses: actions/setup-python@v4 | ||||
|       with: | ||||
|         python-version: '3.x' | ||||
|      | ||||
|     - name: Install PlatformIO | ||||
|       run: | | ||||
|         python -m pip install --upgrade pip | ||||
|         pip install --upgrade platformio | ||||
|      | ||||
|     - name: Build Firmware | ||||
|       run: | | ||||
|         pio run -t buildfs  # Build SPIFFS | ||||
|         pio run            # Build firmware | ||||
|          | ||||
|     - name: Install esptool | ||||
|       run: | | ||||
|         pip install esptool | ||||
|          | ||||
|     - name: Merge firmware and SPIFFS | ||||
|       run: | | ||||
|         esptool.py --chip esp32 merge_bin \ | ||||
|           --flash_mode dio \ | ||||
|           --flash_freq 40m \ | ||||
|           --flash_size 4MB \ | ||||
|           -o .pio/build/esp32dev/filaman_full.bin \ | ||||
|           0x1000 .pio/build/esp32dev/bootloader.bin \ | ||||
|           0x8000 .pio/build/esp32dev/partitions.bin \ | ||||
|           0x10000 .pio/build/esp32dev/firmware.bin \ | ||||
|           0x290000 .pio/build/esp32dev/spiffs.bin | ||||
|  | ||||
|     - name: Prepare OTA firmware | ||||
|       run: | | ||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin | ||||
|      | ||||
|     - name: Get version from tag | ||||
|       id: get_version | ||||
|       run: | | ||||
|         if [ -n "$GITEA_REF" ]; then | ||||
|           echo "VERSION=${GITEA_REF#refs/tags/v}" >> $GITEA_OUTPUT | ||||
|         else | ||||
|           echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT | ||||
|         fi | ||||
|        | ||||
|     - name: Read CHANGELOG.md | ||||
|       id: changelog | ||||
|       run: | | ||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} | ||||
|         CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md) | ||||
|         if [ -n "$GITEA_OUTPUT" ]; then | ||||
|           echo "CHANGES<<EOF" >> $GITEA_OUTPUT | ||||
|           echo "$CHANGELOG" >> $GITEA_OUTPUT | ||||
|           echo "EOF" >> $GITEA_OUTPUT | ||||
|         else | ||||
|           echo "CHANGES<<EOF" >> $GITHUB_OUTPUT | ||||
|           echo "$CHANGELOG" >> $GITHUB_OUTPUT | ||||
|           echo "EOF" >> $GITHUB_OUTPUT | ||||
|         fi | ||||
|      | ||||
|     - name: Upload artifacts | ||||
|       uses: actions/upload-artifact@v3 | ||||
|       with: | ||||
|         name: firmware | ||||
|         path: | | ||||
|           .pio/build/esp32dev/filaman_full.bin | ||||
|           .pio/build/esp32dev/filaman_ota.bin | ||||
							
								
								
									
										21
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										21
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -64,21 +64,38 @@ jobs: | ||||
|           0x1000 .pio/build/esp32dev/bootloader.bin \ | ||||
|           0x8000 .pio/build/esp32dev/partitions.bin \ | ||||
|           0x10000 .pio/build/esp32dev/firmware.bin \ | ||||
|           0x290000 .pio/build/esp32dev/spiffs.bin | ||||
|           0x3D0000 .pio/build/esp32dev/spiffs.bin | ||||
|          | ||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin | ||||
|  | ||||
|     - name: Read CHANGELOG.md | ||||
|       id: changelog | ||||
|       run: | | ||||
|         VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^v//') | ||||
|         CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/ {p=0} p" CHANGELOG.md) | ||||
|         echo "CHANGES<<EOF" >> $GITHUB_OUTPUT | ||||
|         echo "$CHANGELOG" >> $GITHUB_OUTPUT | ||||
|         echo "EOF" >> $GITHUB_OUTPUT | ||||
|         echo "CHANGELOG CONTENT:" | ||||
|         echo "$CHANGELOG" | ||||
|         if [ -z "$CHANGELOG" ]; then | ||||
|           echo "No changelog found for version $VERSION" | ||||
|           exit 1 | ||||
|         fi | ||||
|  | ||||
|     - name: Create Release | ||||
|       env: | ||||
|         TOKEN: ${{ secrets.GITEA_TOKEN }} | ||||
|         GITEA_REF_NAME: ${{ inputs.gitea_ref_name }} | ||||
|         GITEA_SERVER_URL: ${{ inputs.gitea_server_url }} | ||||
|         GITEA_REPOSITORY: ${{ inputs.gitea_repository }} | ||||
|         CHANGELOG: ${{ steps.changelog.outputs.CHANGES }} | ||||
|       run: | | ||||
|         echo "Debug environment:" | ||||
|         echo "GITEA_REF_NAME: ${GITEA_REF_NAME}" | ||||
|         echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}" | ||||
|         echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}" | ||||
|         echo "CHANGELOG: ${CHANGELOG}" | ||||
|          | ||||
|         TAG="${GITEA_REF_NAME}" | ||||
|         API_URL="${GITEA_SERVER_URL}/api/v1" | ||||
| @@ -91,7 +108,7 @@ jobs: | ||||
|           -X POST \ | ||||
|           -H "Authorization: token ${TOKEN}" \ | ||||
|           -H "Content-Type: application/json" \ | ||||
|           -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\"}" \ | ||||
|           -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\",\"body\":\"${CHANGELOG}\"}" \ | ||||
|           "${API_URL}/repos/${REPO}/releases") | ||||
|          | ||||
|         RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1) | ||||
|   | ||||
| @@ -40,7 +40,7 @@ jobs: | ||||
|           0x1000 .pio/build/esp32dev/bootloader.bin \ | ||||
|           0x8000 .pio/build/esp32dev/partitions.bin \ | ||||
|           0x10000 .pio/build/esp32dev/firmware.bin \ | ||||
|           0x290000 .pio/build/esp32dev/spiffs.bin | ||||
|           0x3D0000 .pio/build/esp32dev/spiffs.bin | ||||
|  | ||||
|     - name: Prepare OTA firmware | ||||
|       run: | | ||||
|   | ||||
							
								
								
									
										71
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										71
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,76 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## [1.2.58] - 2025-02-20 | ||||
| ### Added | ||||
| - update version to 1.2.58 in HTML files and platformio configuration | ||||
|  | ||||
|  | ||||
| ## [1.2.57] - 2025-02-20 | ||||
| ### Added | ||||
| - update version to 1.2.57 in platformio configuration | ||||
|  | ||||
| ### Fixed | ||||
| - update spiffs offset and sizes in firmware and partitions configuration | ||||
|  | ||||
|  | ||||
| ## [1.2.56] - 2025-02-19 | ||||
| ### Added | ||||
| - update version to 1.2.56 and adjust firmware and partition settings | ||||
|  | ||||
| ### Changed | ||||
| - remove redundant comment from Gitea release workflow | ||||
|  | ||||
|  | ||||
| ## [1.2.55] - 2025-02-19 | ||||
| ### Added | ||||
| - update version to 1.2.55 and adjust Gitea release workflow to remove 'v' prefix from version | ||||
|  | ||||
|  | ||||
| ## [1.2.54] - 2025-02-19 | ||||
| ### Added | ||||
| - update version to 1.2.54 and add check for missing changelog in Gitea release workflow | ||||
|  | ||||
|  | ||||
| ## [1.2.53] - 2025-02-19 | ||||
| ### Added | ||||
| - update version to 1.2.53 and enhance Gitea release workflow to handle missing changelog | ||||
|  | ||||
|  | ||||
| ## [1.2.52] - 2025-02-19 | ||||
| ### Added | ||||
| - update version to 1.2.52 and improve Gitea release workflow output handling | ||||
|  | ||||
|  | ||||
| ## [1.2.51] - 2025-02-19 | ||||
| ### Added | ||||
| - update version to 1.2.51 and add debug output in Gitea release workflow | ||||
|  | ||||
|  | ||||
| ## [1.2.50] - 2025-02-19 | ||||
| ### Added | ||||
| - update version to 1.2.50 and remove obsolete build workflow | ||||
|  | ||||
|  | ||||
| ## [1.2.49] - 2025-02-19 | ||||
| ### Added | ||||
| - update version to 1.2.49 and modify changelog reading in Gitea release workflow | ||||
|  | ||||
|  | ||||
| ## [1.2.48] - 2025-02-19 | ||||
| ### Added | ||||
| - update version to 1.2.48 and modify changelog reading in release workflows | ||||
|  | ||||
|  | ||||
| ## [1.2.47] - 2025-02-19 | ||||
| ### Added | ||||
| - update version to 1.2.47 and modify changelog reading in GitHub release workflow | ||||
|  | ||||
|  | ||||
| ## [1.2.46] - 2025-02-19 | ||||
| ### Added | ||||
| - update Gitea release workflow to include changelog and increment version to 1.2.46 | ||||
|  | ||||
|  | ||||
| ## [1.2.45] - 2025-02-19 | ||||
| ### Added | ||||
| - update Gitea release workflow to use dynamic upload URL and increment version to 1.2.45 | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
| ; https://docs.platformio.org/page/projectconf.html | ||||
|  | ||||
| [common] | ||||
| version = "1.2.45" | ||||
| version = "1.2.58" | ||||
|  | ||||
| [env:esp32dev] | ||||
| platform = espressif32 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user