Compare commits
	
		
			28 Commits
		
	
	
		
			v1.2.40
			...
			d04ad42b5b
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| d04ad42b5b | |||
| 8d80a8fb5a | |||
| 77032bf9ae | |||
| 3967366ae6 | |||
| cd391378c2 | |||
| 3fc3a689cb | |||
| bd5b32a3b0 | |||
| a5c999234c | |||
| f64d3e51ce | |||
| a650b7d860 | |||
| 14e98072aa | |||
| 0bc4c0565f | |||
| 4aa8e844ac | |||
| d7135fddc8 | |||
| 6e3e978839 | |||
| 33b0e79c18 | |||
| 787d878e83 | |||
| 1e24179b82 | |||
| 67027840f4 | |||
| 2755e9c863 | |||
| 7ae26fb0a9 | |||
| 98bcf98f1e | |||
| bc8ac32fee | |||
| ba74eca21d | |||
| d4e1cf1322 | |||
| 5170784e44 | |||
| ac323167d0 | |||
| 003de5bc00 | 
							
								
								
									
										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
 | 
			
		||||
							
								
								
									
										34
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										34
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							@@ -68,22 +68,39 @@ jobs:
 | 
			
		||||
        
 | 
			
		||||
        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
 | 
			
		||||
 | 
			
		||||
    - name: Read CHANGELOG.md
 | 
			
		||||
      id: changelog
 | 
			
		||||
      run: |
 | 
			
		||||
        VERSION=${{ inputs.gitea_ref_name }}
 | 
			
		||||
        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"
 | 
			
		||||
        REPO="${GITEA_REPOSITORY}"
 | 
			
		||||
        
 | 
			
		||||
        echo "Debug environment:"
 | 
			
		||||
        echo "TAG: ${TAG}"
 | 
			
		||||
        echo "API_URL: ${API_URL}"
 | 
			
		||||
        echo "REPO: ${REPO}"
 | 
			
		||||
        
 | 
			
		||||
        echo "Creating release for ${TAG} on ${REPO}..."
 | 
			
		||||
        
 | 
			
		||||
        # Create release
 | 
			
		||||
@@ -91,12 +108,13 @@ 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)
 | 
			
		||||
        UPLOAD_URL=$(echo "$RESPONSE" | grep -o '"upload_url":"[^"]*' | cut -d':' -f2- | tr -d '"')
 | 
			
		||||
        
 | 
			
		||||
        if [ -n "$RELEASE_ID"; then
 | 
			
		||||
        if [ -n "$RELEASE_ID" ]; then
 | 
			
		||||
          echo "Release created with ID: $RELEASE_ID"
 | 
			
		||||
          
 | 
			
		||||
          # Upload files
 | 
			
		||||
@@ -107,7 +125,7 @@ jobs:
 | 
			
		||||
              -H "Authorization: token ${TOKEN}" \
 | 
			
		||||
              -H "Content-Type: application/octet-stream" \
 | 
			
		||||
              --data-binary "@.pio/build/esp32dev/$file" \
 | 
			
		||||
              "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
 | 
			
		||||
              "${UPLOAD_URL}?name=$file"
 | 
			
		||||
          done
 | 
			
		||||
        else
 | 
			
		||||
          echo "Failed to create release. Response:"
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										11
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							@@ -10,6 +10,9 @@ jobs:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    outputs:
 | 
			
		||||
      provider: ${{ steps.provider.outputs.provider }}
 | 
			
		||||
      gitea_ref_name: ${{ steps.provider.outputs.gitea_ref_name }}
 | 
			
		||||
      gitea_server_url: ${{ steps.provider.outputs.gitea_server_url }}
 | 
			
		||||
      gitea_repository: ${{ steps.provider.outputs.gitea_repository }}
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Checkout Repository
 | 
			
		||||
        uses: actions/checkout@v3
 | 
			
		||||
@@ -20,6 +23,7 @@ jobs:
 | 
			
		||||
          echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}"
 | 
			
		||||
          echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}"
 | 
			
		||||
          echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}"
 | 
			
		||||
          echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}"
 | 
			
		||||
          echo "RUNNER_NAME=${RUNNER_NAME:-not set}"
 | 
			
		||||
 | 
			
		||||
      - name: Determine CI Provider
 | 
			
		||||
@@ -28,6 +32,9 @@ jobs:
 | 
			
		||||
        run: |
 | 
			
		||||
          if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then
 | 
			
		||||
            echo "provider=gitea" >> "$GITHUB_OUTPUT"
 | 
			
		||||
            echo "gitea_ref_name=${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
 | 
			
		||||
            echo "gitea_server_url=${GITHUB_SERVER_URL}" >> "$GITHUB_OUTPUT"
 | 
			
		||||
            echo "gitea_repository=${GITHUB_REPOSITORY}" >> "$GITHUB_OUTPUT"
 | 
			
		||||
          elif [ "${GITHUB_ACTIONS}" = "true" ]; then
 | 
			
		||||
            echo "provider=github" >> "$GITHUB_OUTPUT"
 | 
			
		||||
          else
 | 
			
		||||
@@ -55,5 +62,9 @@ jobs:
 | 
			
		||||
    needs: [route, verify-provider]
 | 
			
		||||
    if: needs.route.outputs.provider == 'gitea'
 | 
			
		||||
    uses: ./.github/workflows/providers/gitea-release.yml
 | 
			
		||||
    with:
 | 
			
		||||
      gitea_ref_name: ${{ needs.route.outputs.gitea_ref_name }}
 | 
			
		||||
      gitea_server_url: ${{ needs.route.outputs.gitea_server_url }}
 | 
			
		||||
      gitea_repository: ${{ needs.route.outputs.gitea_repository }}
 | 
			
		||||
    secrets:
 | 
			
		||||
      GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
 | 
			
		||||
							
								
								
									
										70
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										70
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,5 +1,75 @@
 | 
			
		||||
# Changelog
 | 
			
		||||
 | 
			
		||||
## [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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
## [1.2.44] - 2025-02-19
 | 
			
		||||
### Added
 | 
			
		||||
- update Gitea release workflow to include additional outputs and increment version to 1.2.44
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
## [1.2.43] - 2025-02-19
 | 
			
		||||
### Added
 | 
			
		||||
- update Gitea release workflow by removing unnecessary outputs and increment version to 1.2.43
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
## [1.2.42] - 2025-02-19
 | 
			
		||||
### Added
 | 
			
		||||
- update Gitea release workflow to include additional outputs and increment version to 1.2.42
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
## [1.2.41] - 2025-02-19
 | 
			
		||||
### Added
 | 
			
		||||
- update Gitea release workflow debug output and increment version to 1.2.41
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
## [1.2.40] - 2025-02-19
 | 
			
		||||
### Added
 | 
			
		||||
- add inputs for Gitea release workflow and increment version to 1.2.40
 | 
			
		||||
 
 | 
			
		||||
@@ -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.47</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.47</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.47</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.47</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.47</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.47</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.47</span></h1>
 | 
			
		||||
                <h4>Filament Management Tool</h4>
 | 
			
		||||
            </div>
 | 
			
		||||
        </div>
 | 
			
		||||
 
 | 
			
		||||
@@ -9,7 +9,7 @@
 | 
			
		||||
; https://docs.platformio.org/page/projectconf.html
 | 
			
		||||
 | 
			
		||||
[common]
 | 
			
		||||
version = "1.2.40"
 | 
			
		||||
version = "1.2.54"
 | 
			
		||||
 | 
			
		||||
[env:esp32dev]
 | 
			
		||||
platform = espressif32
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user