Compare commits
	
		
			36 Commits
		
	
	
		
			v1.2.101
			...
			dff184ff25
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| dff184ff25 | |||
| 0ce281221d | |||
| bc26c160e8 | |||
| c25f41db75 | |||
| e107c17f50 | |||
| 85b9d03ebd | |||
| 17b188626a | |||
| a534c5f872 | |||
| 93f7582790 | |||
| 46acc63756 | |||
| 67a9e1bdce | |||
| 2b75b64b4a | |||
| 8d003295e7 | |||
| f89500946a | |||
| 14e745ff06 | |||
| d058397fa2 | |||
| 622f5403a7 | |||
| 92b78a86dd | |||
| ec399390e8 | |||
| 909c4e9b5e | |||
| f4b20bfffd | |||
| 78464215a9 | |||
| 4365f0463a | |||
| 727bc0e760 | |||
| 04604013eb | |||
| cf5fc5f6f1 | |||
| 945a4ccce6 | |||
| 7cf9e2d145 | |||
| 9db4e338ea | |||
| dea6ca2c66 | |||
| e224e72e41 | |||
| 306c517da7 | |||
| 0337bbabe0 | |||
| bde14e50e0 | |||
| 9c656a9bd0 | |||
| eae552017d | 
| @@ -79,15 +79,15 @@ jobs: | |||||||
|          |          | ||||||
|         # Create full binary (always) |         # Create full binary (always) | ||||||
|         (cd .pio/build/esp32dev &&  |         (cd .pio/build/esp32dev &&  | ||||||
|         esptool.py --chip esp32 merge_bin  |         esptool.py --chip esp32 merge_bin \ | ||||||
|           --fill-flash-size 4MB  |           --fill-flash-size 4MB \ | ||||||
|           --flash_mode dio  |           --flash_mode dio \ | ||||||
|           --flash_freq 40m  |           --flash_freq 40m \ | ||||||
|           --flash_size 4MB  |           --flash_size 4MB \ | ||||||
|           -o filaman_full_${VERSION}.bin  |           -o filaman_full_${VERSION}.bin \ | ||||||
|           0x0000 bootloader.bin  |           0x1000 bootloader.bin \ | ||||||
|           0x8000 partitions.bin  |           0x8000 partitions.bin \ | ||||||
|           0x10000 firmware.bin  |           0x10000 firmware.bin \ | ||||||
|           0x390000 spiffs.bin) |           0x390000 spiffs.bin) | ||||||
|          |          | ||||||
|         # Verify file sizes |         # Verify file sizes | ||||||
| @@ -6,8 +6,8 @@ on: | |||||||
| 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 | ||||||
|      |      | ||||||
| @@ -61,17 +61,17 @@ jobs: | |||||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin |         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${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/webpage_${VERSION}.bin | ||||||
|          |          | ||||||
|         # Create full binary (always) |         # Create full binary (always) | ||||||
|         (cd .pio/build/esp32dev && \ |         (cd .pio/build/esp32dev &&  | ||||||
|         esptool.py --chip esp32 merge_bin \ |         esptool.py --chip esp32 merge_bin \ | ||||||
|           --fill-flash-size 4MB \ |           --fill-flash-size 4MB \ | ||||||
|           --flash_mode dio \ |           --flash_mode dio \ | ||||||
|           --flash_freq 40m \ |           --flash_freq 40m \ | ||||||
|           --flash_size 4MB \ |           --flash_size 4MB \ | ||||||
|           -o filaman_full_${VERSION}.bin \ |           -o filaman_full_${VERSION}.bin \ | ||||||
|           0x0000 bootloader.bin \ |           0x1000 bootloader.bin \ | ||||||
|           0x8000 partitions.bin \ |           0x8000 partitions.bin \ | ||||||
|           0x10000 firmware.bin \ |           0x10000 firmware.bin \ | ||||||
|           0x390000 spiffs.bin) |           0x390000 spiffs.bin) | ||||||
							
								
								
									
										24
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										24
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -35,33 +35,19 @@ jobs: | |||||||
|             echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT" |             echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT" | ||||||
|             echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT" |             echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT" | ||||||
|             echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT" |             echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT" | ||||||
|           elif [ "${GITHUB_ACTIONS}" = "true" ]; then |  | ||||||
|             echo "provider=github" >> "$GITHUB_OUTPUT" |  | ||||||
|           else |           else | ||||||
|             echo "provider=unknown" >> "$GITHUB_OUTPUT" |             echo "provider=github" >> "$GITHUB_OUTPUT" | ||||||
|           fi |  | ||||||
|  |  | ||||||
|   verify-provider: |  | ||||||
|     needs: route |  | ||||||
|     runs-on: ubuntu-latest |  | ||||||
|     steps: |  | ||||||
|       - name: Echo detected provider |  | ||||||
|         run: | |  | ||||||
|           echo "Detected CI Provider: ${{ needs.route.outputs.provider }}" |  | ||||||
|           if [ "${{ needs.route.outputs.provider }}" = "unknown" ]; then |  | ||||||
|             echo "::error::Failed to detect CI provider!" |  | ||||||
|             exit 1 |  | ||||||
|           fi |           fi | ||||||
|  |  | ||||||
|   github-release: |   github-release: | ||||||
|     needs: [route, verify-provider] |     needs: route | ||||||
|     if: needs.route.outputs.provider == 'github' |     if: needs.route.outputs.provider == 'github' | ||||||
|     uses: ./.github/workflows/providers/github-release.yml |     uses: ./.github/workflows/github-release.yml | ||||||
|  |  | ||||||
|   gitea-release: |   gitea-release: | ||||||
|     needs: [route, verify-provider] |     needs: route | ||||||
|     if: needs.route.outputs.provider == 'gitea' |     if: needs.route.outputs.provider == 'gitea' | ||||||
|     uses: ./.github/workflows/providers/gitea-release.yml |     uses: ./.github/workflows/gitea-release.yml | ||||||
|     with: |     with: | ||||||
|       gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }} |       gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }} | ||||||
|       gitea_server_url: ${{ needs.route.outputs.gitea_server_url }} |       gitea_server_url: ${{ needs.route.outputs.gitea_server_url }} | ||||||
|   | |||||||
							
								
								
									
										90
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										90
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,95 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## [1.3.10] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.10 | ||||||
|  | - ci: simplify GitHub release workflow by removing provider verification step | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.9] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.9 | ||||||
|  | - ci: comment out permissions for GitHub release workflow | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.8] - 2025-02-21 | ||||||
|  | ### Added | ||||||
|  | - add Gitea and GitHub release workflows | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.8 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.7] - 2025-02-21 | ||||||
|  | ### Added | ||||||
|  | - add GitHub and Gitea release workflows | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.7 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.6] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.6 | ||||||
|  |  | ||||||
|  | ### Fixed | ||||||
|  | - update GitHub token reference and correct file path in release workflow | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.5] - 2025-02-21 | ||||||
|  | ### Added | ||||||
|  | - enhance release workflow to support Gitea alongside GitHub | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.5 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.4] - 2025-02-21 | ||||||
|  | ### Added | ||||||
|  | - add Gitea and GitHub release workflows | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.4 | ||||||
|  | - Merge branch 'old' | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.3] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.3 | ||||||
|  |  | ||||||
|  | ### Fixed | ||||||
|  | - correct directory path in GitHub workflows for SPIFFS binary | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.2] - 2025-02-21 | ||||||
|  | ### Added | ||||||
|  | - add missing conditional exit in release workflow | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.2 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.1] - 2025-02-21 | ||||||
|  | ### Added | ||||||
|  | - enhance GitHub and Gitea release workflows with Python setup and binary preparation | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.1 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.0] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - bump version to 1.3.0 in platformio.ini | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.102] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.2.102 | ||||||
|  |  | ||||||
|  | ### Fixed | ||||||
|  | - adjust bootloader offset in binary merge for Gitea and GitHub workflows | ||||||
|  |  | ||||||
|  |  | ||||||
| ## [1.2.101] - 2025-02-21 | ## [1.2.101] - 2025-02-21 | ||||||
| ### Changed | ### Changed | ||||||
| - update webpages for version v1.2.101 | - update webpages for version v1.2.101 | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ | |||||||
| ; https://docs.platformio.org/page/projectconf.html | ; https://docs.platformio.org/page/projectconf.html | ||||||
|  |  | ||||||
| [common] | [common] | ||||||
| version = "1.2.101" | version = "1.3.10" | ||||||
|  |  | ||||||
| [env:esp32dev] | [env:esp32dev] | ||||||
| platform = espressif32 | platform = espressif32 | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user