Compare commits
	
		
			12 Commits
		
	
	
		
			v1.2.49
			...
			2af23e8084
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 2af23e8084 | |||
| cd204fdaa8 | |||
| d04ad42b5b | |||
| 8d80a8fb5a | |||
| 77032bf9ae | |||
| 3967366ae6 | |||
| cd391378c2 | |||
| 3fc3a689cb | |||
| bd5b32a3b0 | |||
| a5c999234c | |||
| f64d3e51ce | |||
| a650b7d860 | 
							
								
								
									
										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
 | 
					 | 
				
			||||||
@@ -71,12 +71,18 @@ jobs:
 | 
				
			|||||||
    - name: Read CHANGELOG.md
 | 
					    - name: Read CHANGELOG.md
 | 
				
			||||||
      id: changelog
 | 
					      id: changelog
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        CHANGELOG=$(awk "/## \\[${{ inputs.gitea_ref_name }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
 | 
					        # Remove 'v' prefix from version if present
 | 
				
			||||||
 | 
					        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 "CHANGES<<EOF" >> $GITHUB_OUTPUT
 | 
				
			||||||
        echo "$CHANGELOG" >> $GITHUB_OUTPUT
 | 
					        echo "$CHANGELOG" >> $GITHUB_OUTPUT
 | 
				
			||||||
        echo "EOF" >> $GITHUB_OUTPUT
 | 
					        echo "EOF" >> $GITHUB_OUTPUT
 | 
				
			||||||
        echo "CHANGELOG CONTENT:"
 | 
					        echo "CHANGELOG CONTENT:"
 | 
				
			||||||
        echo "$CHANGELOG"
 | 
					        echo "$CHANGELOG"
 | 
				
			||||||
 | 
					        if [ -z "$CHANGELOG" ]; then
 | 
				
			||||||
 | 
					          echo "No changelog found for version $VERSION"
 | 
				
			||||||
 | 
					          exit 1
 | 
				
			||||||
 | 
					        fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: Create Release
 | 
					    - name: Create Release
 | 
				
			||||||
      env:
 | 
					      env:
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										30
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										30
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,5 +1,35 @@
 | 
				
			|||||||
# Changelog
 | 
					# Changelog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [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
 | 
					## [1.2.49] - 2025-02-19
 | 
				
			||||||
### Added
 | 
					### Added
 | 
				
			||||||
- update version to 1.2.49 and modify changelog reading in Gitea release workflow
 | 
					- update version to 1.2.49 and modify changelog reading in Gitea release workflow
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,7 +9,7 @@
 | 
				
			|||||||
; https://docs.platformio.org/page/projectconf.html
 | 
					; https://docs.platformio.org/page/projectconf.html
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[common]
 | 
					[common]
 | 
				
			||||||
version = "1.2.49"
 | 
					version = "1.2.55"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[env:esp32dev]
 | 
					[env:esp32dev]
 | 
				
			||||||
platform = espressif32
 | 
					platform = espressif32
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user