Compare commits
	
		
			9 Commits
		
	
	
		
			v1.0.5
			...
			0ccc67f4b2
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 0ccc67f4b2 | |||
| a027dfb54e | |||
| 07741f2a52 | |||
| 3e9b89f69b | |||
| bf67a635f6 | |||
| 84cccd5014 | |||
| e983b0fcfd | |||
| e01bb9b1f9 | |||
| 17b6051da0 | 
							
								
								
									
										70
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										70
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -5,29 +5,73 @@ on: | |||||||
|     tags: |     tags: | ||||||
|       - 'v*' |       - 'v*' | ||||||
|  |  | ||||||
|  | permissions: | ||||||
|  |   contents: write      # Required for creating releases | ||||||
|  |   issues: read        # Required for reading changelog | ||||||
|  |   pull-requests: read # Required for reading changelog | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|   build: |   build: | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|  |     permissions: | ||||||
|  |       contents: write # Required for creating releases at job level | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v2 |     - 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.bin \ | ||||||
|  |           0x10000 .pio/build/esp32dev/firmware.bin \ | ||||||
|  |           0x290000 .pio/build/esp32dev/spiffs.bin | ||||||
|      |      | ||||||
|     - name: Get version from tag |     - name: Get version from tag | ||||||
|       id: get_version |       id: get_version | ||||||
|       run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/} |       run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT | ||||||
|        |        | ||||||
|     - name: Read CHANGELOG.md |     - name: Read CHANGELOG.md | ||||||
|       id: changelog |       id: changelog | ||||||
|       run: | |       run: | | ||||||
|         CHANGELOG=$(awk "/## \[${{ steps.get_version.outputs.VERSION }}\]/{p=1;print;next} /## \[/{p=0} p" CHANGELOG.md) |         CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md) | ||||||
|         echo "::set-output name=CHANGES::$CHANGELOG" |         echo "CHANGES<<EOF" >> $GITHUB_OUTPUT | ||||||
|  |         echo "$CHANGELOG" >> $GITHUB_OUTPUT | ||||||
|  |         echo "EOF" >> $GITHUB_OUTPUT | ||||||
|      |      | ||||||
|     - name: Create Release |     - name: Install and Configure GitHub CLI | ||||||
|       uses: actions/create-release@v1 |       run: | | ||||||
|  |         curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \ | ||||||
|  |         && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \ | ||||||
|  |         && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \ | ||||||
|  |         && sudo apt update \ | ||||||
|  |         && sudo apt install gh -y | ||||||
|  |          | ||||||
|  |     - name: Create Release with GitHub CLI | ||||||
|       env: |       env: | ||||||
|         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Changed from GITHUB_TOKEN to GH_TOKEN | ||||||
|       with: |       run: | | ||||||
|         tag_name: ${{ github.ref }} |         gh release create "${{ github.ref_name }}" \ | ||||||
|         release_name: Release ${{ steps.get_version.outputs.VERSION }} |           --title "Release ${{ steps.get_version.outputs.VERSION }}" \ | ||||||
|         body: ${{ steps.changelog.outputs.CHANGES }} |           --notes "${{ steps.changelog.outputs.CHANGES }}" \ | ||||||
|         draft: false |           ".pio/build/esp32dev/filaman.bin#filaman.bin" | ||||||
|         prerelease: false |  | ||||||
							
								
								
									
										5
									
								
								partitions.csv
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								partitions.csv
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,5 @@ | |||||||
|  | # Name,   Type, SubType, Offset,  Size, Flags | ||||||
|  | nvs,      data, nvs,     0x9000,  0x5000, | ||||||
|  | otadata,  data, ota,     0xe000,  0x2000, | ||||||
|  | app0,     app,  ota_0,   0x10000, 0x280000, | ||||||
|  | spiffs,   data, spiffs,  0x290000,0x170000, | ||||||
| 
 | 
| @@ -9,7 +9,7 @@ | |||||||
| ; https://docs.platformio.org/page/projectconf.html | ; https://docs.platformio.org/page/projectconf.html | ||||||
|  |  | ||||||
| [common] | [common] | ||||||
| version = "1.0.5" | version = "1.0.6" | ||||||
|  |  | ||||||
| [env:esp32dev] | [env:esp32dev] | ||||||
| platform = espressif32 | platform = espressif32 | ||||||
| @@ -33,6 +33,7 @@ lib_deps = | |||||||
| board_build.filesystem = spiffs | board_build.filesystem = spiffs | ||||||
| board_build.spiffs.partition = 2M | board_build.spiffs.partition = 2M | ||||||
| board_build.spiffs.upload_size = 2M | board_build.spiffs.upload_size = 2M | ||||||
|  | board_build.partitions = partitions.csv | ||||||
|  |  | ||||||
| build_flags =  | build_flags =  | ||||||
|     -Os |     -Os | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user