Compare commits
	
		
			57 Commits
		
	
	
		
			v1.3.2
			...
			982bb5aa21
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 982bb5aa21 | |||
| 007737db13 | |||
| 17e5949201 | |||
| 6a57186091 | |||
| babd3f47a0 | |||
| 5372fe10fe | |||
| e0c9d90892 | |||
| e5f5d1961b | |||
| 31a960fb9e | |||
| 3c2e75b77a | |||
| 367143c456 | |||
| fbde4b764f | |||
| e57f4216d4 | |||
| b8beb992d6 | |||
| 4234b2254e | |||
| b8faf79163 | |||
| d35afaff46 | |||
| a8a00372b5 | |||
| 72f4eab588 | |||
| afa4eddc00 | |||
| b0888e7e63 | |||
| 238a84a8a2 | |||
| 59cc00ca13 | |||
| ab083f5f57 | |||
| c111573206 | |||
| 52b2494e52 | |||
| 069ec2d7a1 | |||
| 94e35ae86e | |||
| d71e3d8184 | |||
| bb166aa29f | |||
| 0d718023f8 | |||
| b16781043f | |||
| 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 | 
							
								
								
									
										89
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										89
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,89 @@ | |||||||
|  | name: Gitea Release | ||||||
|  |  | ||||||
|  | on: | ||||||
|  |   workflow_call: | ||||||
|  |  | ||||||
|  | jobs: | ||||||
|  |   create-release: | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     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 esptool | ||||||
|  |      | ||||||
|  |     - name: Install xxd | ||||||
|  |       run: | | ||||||
|  |         sudo apt-get update | ||||||
|  |         sudo apt-get install xxd | ||||||
|  |      | ||||||
|  |     - name: Build Firmware | ||||||
|  |       run: | | ||||||
|  |         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) | ||||||
|  |          | ||||||
|  |         # Build firmware and SPIFFS | ||||||
|  |         echo "Building firmware and SPIFFS..." | ||||||
|  |         pio run -e esp32dev | ||||||
|  |         pio run -t buildfs | ||||||
|  |          | ||||||
|  |         # Copy firmware binary | ||||||
|  |         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin | ||||||
|  |          | ||||||
|  |         # Create SPIFFS binary | ||||||
|  |         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||||
|  |          | ||||||
|  |         # Create full binary | ||||||
|  |         (cd .pio/build/esp32dev &&  | ||||||
|  |         esptool.py --chip esp32 merge_bin \ | ||||||
|  |           --fill-flash-size 4MB \ | ||||||
|  |           --flash_mode dio \ | ||||||
|  |           --flash_freq 40m \ | ||||||
|  |           --flash_size 4MB \ | ||||||
|  |           -o filaman_full_${VERSION}.bin \ | ||||||
|  |           0x1000 bootloader.bin \ | ||||||
|  |           0x8000 partitions.bin \ | ||||||
|  |           0x10000 firmware.bin \ | ||||||
|  |           0x390000 spiffs.bin) | ||||||
|  |          | ||||||
|  |         # Verify file sizes | ||||||
|  |         echo "File sizes:" | ||||||
|  |         (cd .pio/build/esp32dev && ls -lh *.bin) | ||||||
|  |      | ||||||
|  |     - name: Get version from platformio.ini | ||||||
|  |       id: get_version | ||||||
|  |       run: | | ||||||
|  |         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) | ||||||
|  |         echo "VERSION=$VERSION" >> $GITHUB_OUTPUT | ||||||
|  |        | ||||||
|  |     - 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) | ||||||
|  |         echo "CHANGES<<EOF" >> $GITHUB_OUTPUT | ||||||
|  |         echo "$CHANGELOG" >> $GITHUB_OUTPUT | ||||||
|  |         echo "EOF" >> $GITHUB_OUTPUT | ||||||
|  |  | ||||||
|  |     - name: Create Gitea Release | ||||||
|  |       run: | | ||||||
|  |         VERSION=${{ steps.get_version.outputs.VERSION }} | ||||||
|  |         cd .pio/build/esp32dev | ||||||
|  |          | ||||||
|  |         # Prepare files for upload | ||||||
|  |         FILES="" | ||||||
|  |         for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${VERSION}.bin filaman_full_${VERSION}.bin; do | ||||||
|  |           if [ -f "$file" ]; then | ||||||
|  |             FILES="$FILES -a $file" | ||||||
|  |           fi | ||||||
|  |         done | ||||||
|  |          | ||||||
|  |         # Create release using git command | ||||||
|  |         git tag -a "v${VERSION}" -m "Release ${VERSION}" | ||||||
|  |         git push origin "v${VERSION}" | ||||||
| @@ -2,6 +2,13 @@ name: GitHub Release | |||||||
| 
 | 
 | ||||||
| on: | on: | ||||||
|   workflow_call: |   workflow_call: | ||||||
|  |     secrets: | ||||||
|  |       RELEASE_TOKEN: | ||||||
|  |         description: 'GitHub token for release creation' | ||||||
|  |         required: true | ||||||
|  | 
 | ||||||
|  | permissions: | ||||||
|  |   contents: write | ||||||
| 
 | 
 | ||||||
| jobs: | jobs: | ||||||
|   create-release: |   create-release: | ||||||
| @@ -10,6 +17,8 @@ jobs: | |||||||
|       contents: write |       contents: write | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v4 |     - uses: actions/checkout@v4 | ||||||
|  |       with: | ||||||
|  |         fetch-depth: 0 | ||||||
|      |      | ||||||
|     - name: Set up Python |     - name: Set up Python | ||||||
|       uses: actions/setup-python@v4 |       uses: actions/setup-python@v4 | ||||||
| @@ -58,10 +67,10 @@ jobs: | |||||||
|         pio run -t buildfs |         pio run -t buildfs | ||||||
|          |          | ||||||
|         # Copy firmware binary |         # Copy firmware binary | ||||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin |         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${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/upgrade_filaman_website_v${VERSION}.bin | ||||||
|          |          | ||||||
|         # Create full binary (always) |         # Create full binary (always) | ||||||
|         (cd .pio/build/esp32dev &&  |         (cd .pio/build/esp32dev &&  | ||||||
| @@ -97,22 +106,22 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     - name: Create GitHub Release |     - name: Create GitHub Release | ||||||
|       env: |       env: | ||||||
|         GH_TOKEN: ${{ github.token }} |         GH_TOKEN: ${{ secrets.RELEASE_TOKEN }} | ||||||
|       run: | |       run: | | ||||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} |         VERSION=${{ steps.get_version.outputs.VERSION }} | ||||||
|  |         cd .pio/build/esp32dev | ||||||
|          |          | ||||||
|         # Create release with available files |         # Create release with available files | ||||||
|         cd .pio/build/esp32dev |  | ||||||
|         FILES_TO_UPLOAD="" |         FILES_TO_UPLOAD="" | ||||||
|          |          | ||||||
|         # Always add firmware |         # Always add firmware | ||||||
|         if [ -f "filaman_${VERSION}.bin" ]; then |         if [ -f "update_filaman_firmware_v${VERSION}.bin" ]; then | ||||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_${VERSION}.bin" |           FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_firmware_v${VERSION}.bin" | ||||||
|         fi |         fi | ||||||
|          |          | ||||||
|         # Add SPIFFS and full binary only if they exist |         # Add SPIFFS and full binary only if they exist | ||||||
|         if [ -f "webpage_${VERSION}.bin" ]; then |         if [ -f "update_filaman_website_v${VERSION}.bin" ]; then | ||||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD webpage_${VERSION}.bin" |           FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin" | ||||||
|         fi |         fi | ||||||
|          |          | ||||||
|         if [ -f "filaman_full_${VERSION}.bin" ]; then |         if [ -f "filaman_full_${VERSION}.bin" ]; then | ||||||
							
								
								
									
										182
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										182
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -1,182 +0,0 @@ | |||||||
| name: Gitea Release |  | ||||||
|  |  | ||||||
| on: |  | ||||||
|   workflow_call: |  | ||||||
|     inputs: |  | ||||||
|       gitea_server_url: |  | ||||||
|         required: true |  | ||||||
|         type: string |  | ||||||
|       gitea_repository: |  | ||||||
|         required: true |  | ||||||
|         type: string |  | ||||||
|     secrets: |  | ||||||
|       GITEA_TOKEN: |  | ||||||
|         required: true |  | ||||||
|  |  | ||||||
| jobs: |  | ||||||
|   create-release: |  | ||||||
|     runs-on: ubuntu-latest |  | ||||||
|     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 esptool |  | ||||||
|      |  | ||||||
|     - name: Install xxd |  | ||||||
|       run: | |  | ||||||
|         sudo apt-get update |  | ||||||
|         sudo apt-get install xxd |  | ||||||
|      |  | ||||||
|     - name: Check for SPIFFS changes |  | ||||||
|       id: check_spiffs |  | ||||||
|       run: | |  | ||||||
|         git fetch --unshallow || true |  | ||||||
|         CHANGED_FILES=$(git diff --name-only HEAD^..HEAD) |  | ||||||
|         if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then |  | ||||||
|           echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT |  | ||||||
|         else |  | ||||||
|           echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT |  | ||||||
|         fi |  | ||||||
|      |  | ||||||
|     - name: Check for Data changes |  | ||||||
|       id: check_data |  | ||||||
|       run: | |  | ||||||
|         git fetch --unshallow || true |  | ||||||
|         CHANGED_FILES=$(git diff --name-only HEAD^..HEAD) |  | ||||||
|         if echo "$CHANGED_FILES" | grep -q "^data/"; then |  | ||||||
|           echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT |  | ||||||
|         else |  | ||||||
|           echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT |  | ||||||
|         fi |  | ||||||
|      |  | ||||||
|     - name: Get version from platformio.ini |  | ||||||
|       id: get_version |  | ||||||
|       run: | |  | ||||||
|         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) |  | ||||||
|         echo "VERSION=$VERSION" >> $GITHUB_OUTPUT |  | ||||||
|  |  | ||||||
|     - name: Build Firmware |  | ||||||
|       run: | |  | ||||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} |  | ||||||
|          |  | ||||||
|         # Always build firmware and SPIFFS |  | ||||||
|         echo "Building firmware and SPIFFS..." |  | ||||||
|         pio run -e esp32dev |  | ||||||
|         pio run -t buildfs |  | ||||||
|          |  | ||||||
|         # Copy firmware binary |  | ||||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin |  | ||||||
|          |  | ||||||
|         # Always create SPIFFS binary |  | ||||||
|         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin |  | ||||||
|          |  | ||||||
|         # Create full binary (always) |  | ||||||
|         (cd .pio/build/esp32dev &&  |  | ||||||
|         esptool.py --chip esp32 merge_bin \ |  | ||||||
|           --fill-flash-size 4MB \ |  | ||||||
|           --flash_mode dio \ |  | ||||||
|           --flash_freq 40m \ |  | ||||||
|           --flash_size 4MB \ |  | ||||||
|           -o filaman_full_${VERSION}.bin \ |  | ||||||
|           0x1000 bootloader.bin \ |  | ||||||
|           0x8000 partitions.bin \ |  | ||||||
|           0x10000 firmware.bin \ |  | ||||||
|           0x390000 spiffs.bin) |  | ||||||
|          |  | ||||||
|         # Verify file sizes |  | ||||||
|         echo "File sizes:" |  | ||||||
|         (cd .pio/build/esp32dev && ls -lh *.bin) |  | ||||||
|          |  | ||||||
|     - name: Prepare binaries |  | ||||||
|       run: | |  | ||||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} |  | ||||||
|          |  | ||||||
|         # Create full binary only if SPIFFS changed |  | ||||||
|         if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then |  | ||||||
|           echo "Creating full binary..." |  | ||||||
|           cd .pio/build/esp32dev && \ |  | ||||||
|           esptool.py --chip esp32 merge_bin \ |  | ||||||
|             --fill-flash-size 4MB \ |  | ||||||
|             --flash_mode dio \ |  | ||||||
|             --flash_freq 40m \ |  | ||||||
|             --flash_size 4MB \ |  | ||||||
|             -o filaman_full_${VERSION}.bin \ |  | ||||||
|             0x0000 bootloader.bin \ |  | ||||||
|             0x8000 partitions.bin \ |  | ||||||
|             0x10000 firmware.bin \ |  | ||||||
|             0x390000 spiffs.bin |  | ||||||
|         fi |  | ||||||
|          |  | ||||||
|         # Verify file sizes |  | ||||||
|         echo "File sizes:" |  | ||||||
|         cd .pio/build/esp32dev && ls -lh *.bin |  | ||||||
|  |  | ||||||
|     - 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) |  | ||||||
|         echo "CHANGES<<EOF" >> $GITHUB_OUTPUT |  | ||||||
|         echo "$CHANGELOG" >> $GITHUB_OUTPUT |  | ||||||
|         echo "EOF" >> $GITHUB_OUTPUT |  | ||||||
|          |  | ||||||
|     - name: Create Release |  | ||||||
|       env: |  | ||||||
|         TOKEN: ${{ secrets.GITEA_TOKEN }} |  | ||||||
|       run: | |  | ||||||
|         API_URL="${{ inputs.gitea_server_url }}/api/v1" |  | ||||||
|         REPO="${{ inputs.gitea_repository }}" |  | ||||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} |  | ||||||
|          |  | ||||||
|         # Create release |  | ||||||
|         RESPONSE=$(curl -k -s \ |  | ||||||
|           -X POST \ |  | ||||||
|           -H "Authorization: token ${TOKEN}" \ |  | ||||||
|           -H "Content-Type: application/json" \ |  | ||||||
|           -d "{ |  | ||||||
|             \"tag_name\":\"v${VERSION}\", |  | ||||||
|             \"name\":\"Release ${VERSION}\", |  | ||||||
|             \"body\":\"${{ steps.changelog.outputs.CHANGES }}\" |  | ||||||
|           }" \ |  | ||||||
|           "${API_URL}/repos/${REPO}/releases") |  | ||||||
|          |  | ||||||
|         RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1) |  | ||||||
|          |  | ||||||
|         if [ -n "$RELEASE_ID" ]; then |  | ||||||
|           echo "Release created with ID: $RELEASE_ID" |  | ||||||
|            |  | ||||||
|           # Always upload firmware and full binary |  | ||||||
|           for file in filaman_${VERSION}.bin filaman_full_${VERSION}.bin; do |  | ||||||
|             if [ -f ".pio/build/esp32dev/$file" ]; then |  | ||||||
|               echo "Uploading $file..." |  | ||||||
|               curl -k -s \ |  | ||||||
|                 -X POST \ |  | ||||||
|                 -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" |  | ||||||
|             fi |  | ||||||
|           done |  | ||||||
|            |  | ||||||
|           # Upload SPIFFS binary only if it exists (data changes) |  | ||||||
|           if [ -f ".pio/build/esp32dev/webpage_${VERSION}.bin" ]; then |  | ||||||
|             echo "Uploading webpage binary..." |  | ||||||
|             curl -k -s \ |  | ||||||
|               -X POST \ |  | ||||||
|               -H "Authorization: token ${TOKEN}" \ |  | ||||||
|               -H "Content-Type: application/octet-stream" \ |  | ||||||
|               --data-binary "@.pio/build/esp32dev/webpage_${VERSION}.bin" \ |  | ||||||
|               "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=webpage_${VERSION}.bin" |  | ||||||
|           fi |  | ||||||
|         else |  | ||||||
|           echo "Failed to create release. Response:" |  | ||||||
|           echo "$RESPONSE" |  | ||||||
|           exit 1 |  | ||||||
|         fi |  | ||||||
							
								
								
									
										224
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										224
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -5,233 +5,35 @@ on: | |||||||
|     tags: |     tags: | ||||||
|       - 'v*' |       - 'v*' | ||||||
|  |  | ||||||
|  | permissions: | ||||||
|  |   contents: write | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|   route: |   detect-provider: | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     outputs: |     outputs: | ||||||
|       provider: ${{ steps.provider.outputs.provider }} |       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: |     steps: | ||||||
|       - name: Checkout Repository |  | ||||||
|         uses: actions/checkout@v3 |  | ||||||
|  |  | ||||||
|       - name: Debug Environment |  | ||||||
|         run: | |  | ||||||
|           echo "CI Environment Details:" |  | ||||||
|           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 |       - name: Determine CI Provider | ||||||
|         id: provider |         id: provider | ||||||
|         shell: bash |         shell: bash | ||||||
|         run: | |         run: | | ||||||
|           if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then |           if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then | ||||||
|             echo "provider=gitea" >> "$GITHUB_OUTPUT" |             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 |           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: detect-provider | ||||||
|     if: needs.route.outputs.provider == 'github' |  | ||||||
|     runs-on: ubuntu-latest |  | ||||||
|     permissions: |     permissions: | ||||||
|       contents: write |       contents: write | ||||||
|     steps: |     if: needs.detect-provider.outputs.provider == 'github' | ||||||
|     - uses: actions/checkout@v4 |     uses: ./.github/workflows/github-release.yml | ||||||
|     - name: Set up Python |     secrets: | ||||||
|       uses: actions/setup-python@v4 |       RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||||||
|       with: |  | ||||||
|         python-version: '3.x' |  | ||||||
|     - name: Install PlatformIO |  | ||||||
|       run: | |  | ||||||
|         python -m pip install --upgrade pip |  | ||||||
|         pip install --upgrade platformio esptool |  | ||||||
|     - name: Install xxd |  | ||||||
|       run: | |  | ||||||
|         sudo apt-get update |  | ||||||
|         sudo apt-get install xxd |  | ||||||
|     - name: Check for Data changes |  | ||||||
|       id: check_data |  | ||||||
|       run: | |  | ||||||
|         git fetch --unshallow || true |  | ||||||
|         CHANGED_FILES=$(git diff --name-only HEAD^..HEAD) |  | ||||||
|         if echo "$CHANGED_FILES" | grep -q "^data/"; then |  | ||||||
|           echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT |  | ||||||
|         else |  | ||||||
|           echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT |  | ||||||
|         fi |  | ||||||
|     - name: Check for SPIFFS changes |  | ||||||
|       id: check_spiffs |  | ||||||
|       run: | |  | ||||||
|         git fetch --unshallow || true |  | ||||||
|         CHANGED_FILES=$(git diff --name-only HEAD^..HEAD) |  | ||||||
|         if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then |  | ||||||
|           echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT |  | ||||||
|         else |  | ||||||
|           echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT |  | ||||||
|         fi |  | ||||||
|     - name: Build Firmware |  | ||||||
|       run: | |  | ||||||
|         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) |  | ||||||
|         echo "Building firmware and SPIFFS..." |  | ||||||
|         pio run -e esp32dev |  | ||||||
|         pio run -t buildfs |  | ||||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin |  | ||||||
|         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin |  | ||||||
|         (cd .pio/build/esp32dev && esptool.py --chip esp32 merge_bin --fill-flash-size 4MB --flash_mode dio --flash_freq 40m --flash_size 4MB -o filaman_full_${VERSION}.bin 0x1000 bootloader.bin 0x8000 partitions.bin 0x10000 firmware.bin 0x390000 spiffs.bin) |  | ||||||
|         echo "File sizes:" |  | ||||||
|         (cd .pio.build/esp32dev && ls -lh *.bin) |  | ||||||
|     - name: Get version from platformio.ini |  | ||||||
|       id: get_version |  | ||||||
|       run: | |  | ||||||
|         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) |  | ||||||
|         echo "VERSION=$VERSION" >> $GITHUB_OUTPUT |  | ||||||
|     - 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) |  | ||||||
|         echo "CHANGES<<EOF" >> $GITHUB_OUTPUT |  | ||||||
|         echo "$CHANGELOG" >> $GITHUB_OUTPUT |  | ||||||
|         echo "EOF" >> $GITHUB_OUTPUT |  | ||||||
|     - name: Create GitHub Release |  | ||||||
|       env: |  | ||||||
|         GH_TOKEN: ${{ github.token }} |  | ||||||
|       run: | |  | ||||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} |  | ||||||
|         cd .pio/build/esp32dev |  | ||||||
|         FILES_TO_UPLOAD="" |  | ||||||
|         if [ -f "filaman_${VERSION}.bin" ]; then |  | ||||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_${VERSION}.bin" |  | ||||||
|         fi |  | ||||||
|         if [ -f "webpage_${VERSION}.bin" ]; then |  | ||||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD webpage_${VERSION}.bin" |  | ||||||
|         fi |  | ||||||
|         if [ -f "filaman_full_${VERSION}.bin" ]; then |  | ||||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD filaman_full_${VERSION}.bin" |  | ||||||
|         fi |  | ||||||
|         if [ -n "$FILES_TO_UPLOAD" ]; then |  | ||||||
|           gh release create "v${VERSION}" --title "Release ${VERSION}" --notes "${{ steps.changelog.outputs.CHANGES }}" $FILES_TO_UPLOAD |  | ||||||
|         else |  | ||||||
|           echo "Error: No files found to upload" |  | ||||||
|           exit 1 |  | ||||||
|  |  | ||||||
|   gitea-release: |   gitea-release: | ||||||
|     needs: [route, verify-provider] |     needs: detect-provider | ||||||
|     if: needs.route.outputs.provider == 'gitea' |     if: needs.detect-provider.outputs.provider == 'gitea' | ||||||
|     runs-on: ubuntu-latest |     uses: ./.github/workflows/gitea-release.yml | ||||||
|     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 esptool |  | ||||||
|     - name: Install xxd |  | ||||||
|       run: | |  | ||||||
|         sudo apt-get update |  | ||||||
|         sudo apt-get install xxd |  | ||||||
|     - name: Check for SPIFFS changes |  | ||||||
|       id: check_spiffs |  | ||||||
|       run: | |  | ||||||
|         git fetch --unshallow || true |  | ||||||
|         CHANGED_FILES=$(git diff --name-only HEAD^..HEAD) |  | ||||||
|         if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then |  | ||||||
|           echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT |  | ||||||
|         else |  | ||||||
|           echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT |  | ||||||
|         fi |  | ||||||
|     - name: Check for Data changes |  | ||||||
|       id: check_data |  | ||||||
|       run: | |  | ||||||
|         git fetch --unshallow || true |  | ||||||
|         CHANGED_FILES=$(git diff --name-only HEAD^..HEAD) |  | ||||||
|         if echo "$CHANGED_FILES" | grep -q "^data/"; then |  | ||||||
|           echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT |  | ||||||
|         else |  | ||||||
|           echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT |  | ||||||
|         fi |  | ||||||
|     - name: Get version from platformio.ini |  | ||||||
|       id: get_version |  | ||||||
|       run: | |  | ||||||
|         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) |  | ||||||
|         echo "VERSION=$VERSION" >> $GITHUB_OUTPUT |  | ||||||
|     - name: Build Firmware |  | ||||||
|       run: | |  | ||||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} |  | ||||||
|         echo "Building firmware and SPIFFS..." |  | ||||||
|         pio run -e esp32dev |  | ||||||
|         pio run -t buildfs |  | ||||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_${VERSION}.bin |  | ||||||
|         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/webpage_${VERSION}.bin |  | ||||||
|         (cd .pio/build/esp32dev && esptool.py --chip esp32 merge_bin --fill-flash-size 4MB --flash_mode dio --flash_freq 40m --flash_size 4MB -o filaman_full_${VERSION}.bin 0x1000 bootloader.bin 0x8000 partitions.bin 0x10000 firmware.bin 0x390000 spiffs.bin) |  | ||||||
|         echo "File sizes:" |  | ||||||
|         (cd .pio/build/esp32dev && ls -lh *.bin) |  | ||||||
|     - name: Prepare binaries |  | ||||||
|       run: | |  | ||||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} |  | ||||||
|         if [[ "${{ steps.check_spiffs.outputs.SPIFFS_CHANGED }}" == "true" ]]; then |  | ||||||
|           echo "Creating full binary..." |  | ||||||
|           cd .pio/build/esp32dev && esptool.py --chip esp32 merge_bin --fill-flash-size 4MB --flash_mode dio --flash_freq 40m --flash_size 4MB -o filaman_full_${VERSION}.bin 0x0000 bootloader.bin 0x8000 partitions.bin 0x10000 firmware.bin 0x390000 spiffs.bin |  | ||||||
|         fi |  | ||||||
|         echo "File sizes:" |  | ||||||
|         cd .pio/build/esp32dev && ls -lh *.bin |  | ||||||
|     - 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) |  | ||||||
|         echo "CHANGES<<EOF" >> $GITHUB_OUTPUT |  | ||||||
|         echo "$CHANGELOG" >> $GITHUB_OUTPUT |  | ||||||
|         echo "EOF" >> $GITHUB_OUTPUT |  | ||||||
|     - name: Create Release |  | ||||||
|       env: |  | ||||||
|         TOKEN: ${{ secrets.GITEA_TOKEN }} |  | ||||||
|       run: | |  | ||||||
|         API_URL="${{ needs.route.outputs.gitea_server_url }}/api/v1" |  | ||||||
|         REPO="${{ needs.route.outputs.gitea_repository }}" |  | ||||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} |  | ||||||
|         RESPONSE=$(curl -k -s -X POST -H "Authorization: token ${TOKEN}" -H "Content-Type: application/json" -d "{\"tag_name\":\"v${VERSION}\",\"name\":\"Release ${VERSION}\",\"body\":\"${{ steps.changelog.outputs.CHANGES }}\"}" "${API_URL}/repos/${REPO}/releases") |  | ||||||
|         RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1) |  | ||||||
|         if [ -n "$RELEASE_ID" ]; then |  | ||||||
|           echo "Release created with ID: $RELEASE_ID" |  | ||||||
|           for file in filaman_${VERSION}.bin filaman_full_${VERSION}.bin; do |  | ||||||
|             if [ -f ".pio/build/esp32dev/$file" ]; then |  | ||||||
|               echo "Uploading $file..." |  | ||||||
|               curl -k -s -X POST -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" |  | ||||||
|             fi |  | ||||||
|           done |  | ||||||
|           if [ -f ".pio/build/esp32dev/webpage_${VERSION}.bin" ]; then |  | ||||||
|             echo "Uploading webpage binary..." |  | ||||||
|             curl -k -s -X POST -H "Authorization: token ${TOKEN}" -H "Content-Type: application/octet-stream" --data-binary "@.pio/build/esp32dev/webpage_${VERSION}.bin" "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=webpage_${VERSION}.bin" |  | ||||||
|           fi |  | ||||||
|         else |  | ||||||
|           echo "Failed to create release. Response:" |  | ||||||
|           echo "$RESPONSE" |  | ||||||
|           exit 1 |  | ||||||
							
								
								
									
										132
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										132
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,137 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## [1.3.20] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.20 | ||||||
|  | - workflow: enable git tagging and pushing for Gitea releases | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.19] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.19 | ||||||
|  | - workflow: enable git push for version tagging in Gitea release | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.18] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - ACHTUNG: Installiere einmal das filaman_full.bin danach kannst du über die upgrade Files aktualisieren und deine Settings bleiben auch erhalten. | ||||||
|  | - ATTENTION: Install the filaman_full.bin once, then you can update via the upgrade files and your settings will also be retained. | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.18] - 2025-02-21 | ||||||
|  | ### Added | ||||||
|  | - add note about filaman_full.bin installation in changelog | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.18 | ||||||
|  | - update changelog for version 1.3.18 and enhance update script for existing entries | ||||||
|  |  | ||||||
|  | ## [1.3.17] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.17 | ||||||
|  | - ci: comment out git tag and push commands in gitea-release workflow | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.16] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.16 | ||||||
|  | - ci: update filenames for firmware and website binaries in release workflows | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.15] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.15 | ||||||
|  |  | ||||||
|  | ### Fixed | ||||||
|  | - ci: fix missing 'fi' in GitHub release workflow script | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.14] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.14 | ||||||
|  | - ci: update GitHub release workflow to improve file upload handling | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.13] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.13 | ||||||
|  | - ci: update GitHub release workflow to use RELEASE_TOKEN for improved security | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.12] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.12 | ||||||
|  | - ci: enhance GitHub release workflow with token handling and file upload improvements | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.11] - 2025-02-21 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.11 | ||||||
|  | - ci: refactor Gitea release workflow by simplifying input handling and removing unnecessary checks | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [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 | ## [1.3.2] - 2025-02-21 | ||||||
| ### Added | ### Added | ||||||
| - add missing conditional exit in release workflow | - add missing conditional exit in release workflow | ||||||
|   | |||||||
| @@ -9,7 +9,9 @@ | |||||||
| ; https://docs.platformio.org/page/projectconf.html | ; https://docs.platformio.org/page/projectconf.html | ||||||
|  |  | ||||||
| [common] | [common] | ||||||
| version = "1.3.2" | version = "1.3.20" | ||||||
|  |  | ||||||
|  | #test | ||||||
|  |  | ||||||
| [env:esp32dev] | [env:esp32dev] | ||||||
| platform = espressif32 | platform = espressif32 | ||||||
|   | |||||||
| @@ -122,7 +122,29 @@ def update_changelog(): | |||||||
|                 f.write(updated_content) |                 f.write(updated_content) | ||||||
|             push_changes(version) |             push_changes(version) | ||||||
|         else: |         else: | ||||||
|             print(f"Version {version} already exists in changelog") |             # Version existiert bereits, füge neue Einträge unter der existierenden Version ein | ||||||
|  |             version_pattern = f"## \\[{version}\\] - \\d{{4}}-\\d{{2}}-\\d{{2}}" | ||||||
|  |             next_version_pattern = "## \\[.*?\\] - \\d{4}-\\d{2}-\\d{2}" | ||||||
|  |              | ||||||
|  |             # Finde den Start der aktuellen Version | ||||||
|  |             version_match = re.search(version_pattern, content) | ||||||
|  |             if version_match: | ||||||
|  |                 version_start = version_match.end() | ||||||
|  |                 # Suche nach der nächsten Version | ||||||
|  |                 next_version_match = re.search(next_version_pattern, content[version_start:]) | ||||||
|  |                  | ||||||
|  |                 if next_version_match: | ||||||
|  |                     # Füge zwischen aktueller und nächster Version ein | ||||||
|  |                     insert_pos = version_start + next_version_match.start() | ||||||
|  |                     updated_content = content[:insert_pos] + "\n" + changelog_entry + content[insert_pos:] | ||||||
|  |                 else: | ||||||
|  |                     # Füge am Ende des Abschnitts ein | ||||||
|  |                     updated_content = content[:version_start] + "\n" + changelog_entry + content[version_start:] | ||||||
|  |                  | ||||||
|  |                 with open(changelog_path, 'w') as f: | ||||||
|  |                     f.write(updated_content) | ||||||
|  |                 push_changes(version) | ||||||
|  |                 print(f"Added new entries to existing version {version}") | ||||||
|  |  | ||||||
| if __name__ == "__main__": | if __name__ == "__main__": | ||||||
|     update_changelog() |     update_changelog() | ||||||
		Reference in New Issue
	
	Block a user