Compare commits
	
		
			57 Commits
		
	
	
		
			v1.2.32
			...
			8f8322e629
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 8f8322e629 | |||
| 1e386c49af | |||
| 3070d75d07 | |||
| 34ee9badea | |||
| 6594af9540 | |||
| c21bd2d4ec | |||
| e5f895b560 | |||
| bb0f50ce1d | |||
| 499a08aa75 | |||
| 745d960f62 | |||
| 531d0fe9a2 | |||
| 2af23e8084 | |||
| cd204fdaa8 | |||
| 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 | |||
| 83595cfadf | |||
| cfe21d63d7 | |||
| 63e72076ed | |||
| 2a011ee244 | |||
| 84dd2bd40b | |||
| 1449cacc0e | |||
| f1c2b2eb87 | |||
| 0f1a3b1d5b | |||
| 6190cf04db | |||
| 680aed0e10 | |||
| fadb122d28 | |||
| 4347f89c16 | |||
| 9856757e49 | |||
| afb7b5f42b | |||
| ba8506247b | |||
| 61f3f90d6d | 
							
								
								
									
										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 |  | ||||||
							
								
								
									
										232
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										232
									
								
								.github/workflows/providers/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -2,36 +2,60 @@ name: Gitea Release | |||||||
|  |  | ||||||
| on: | on: | ||||||
|   workflow_call: |   workflow_call: | ||||||
|  |     inputs: | ||||||
|  |       gitea_ref_name: | ||||||
|  |         description: 'Gitea ref name' | ||||||
|  |         required: true | ||||||
|  |         type: string | ||||||
|  |       gitea_server_url: | ||||||
|  |         description: 'Gitea server URL' | ||||||
|  |         required: true | ||||||
|  |         type: string | ||||||
|  |       gitea_repository: | ||||||
|  |         description: 'Gitea repository' | ||||||
|  |         required: true | ||||||
|  |         type: string | ||||||
|  |     secrets: | ||||||
|  |       GITEA_TOKEN: | ||||||
|  |         required: true | ||||||
|  |  | ||||||
| jobs: | jobs: | ||||||
|   create-release: |   create-release: | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     permissions: |  | ||||||
|       contents: write |  | ||||||
|     steps: |     steps: | ||||||
|     - uses: actions/checkout@v4 |     - name: Checkout Repository | ||||||
|  |       uses: actions/checkout@v4 | ||||||
|  |  | ||||||
|     - name: Set up Python |     - name: Install System Dependencies | ||||||
|       uses: actions/setup-python@v4 |  | ||||||
|       with: |  | ||||||
|         python-version: '3.x' |  | ||||||
|      |  | ||||||
|     - name: Install PlatformIO |  | ||||||
|       run: | |       run: | | ||||||
|         python -m pip install --upgrade pip |         sudo apt-get update | ||||||
|         pip install --upgrade platformio |         sudo apt-get install -y python3 python3-venv build-essential curl git | ||||||
|  |  | ||||||
|  |     - name: Set up Python Virtual Environment | ||||||
|  |       run: | | ||||||
|  |         python3 -m venv venv | ||||||
|  |         source venv/bin/activate | ||||||
|  |         pip install --upgrade pip | ||||||
|  |         pip install platformio esptool | ||||||
|  |          | ||||||
|  |         echo "Verifying installations:" | ||||||
|  |         platformio --version | ||||||
|  |         python3 --version | ||||||
|  |         esptool.py version | ||||||
|  |  | ||||||
|     - name: Build Firmware |     - name: Build Firmware | ||||||
|       run: | |       run: | | ||||||
|         pio run -t buildfs  # Build SPIFFS |         source venv/bin/activate | ||||||
|         pio run            # Build firmware |         echo "Building SPIFFS..." | ||||||
|  |         platformio run -t buildfs | ||||||
|          |          | ||||||
|     - name: Install esptool |         echo "Building firmware..." | ||||||
|       run: | |         platformio run | ||||||
|         pip install esptool |  | ||||||
|  |  | ||||||
|     - name: Merge firmware and SPIFFS |     - name: Create Release Files | ||||||
|       run: | |       run: | | ||||||
|  |         source venv/bin/activate | ||||||
|  |         echo "Creating release files..." | ||||||
|         esptool.py --chip esp32 merge_bin \ |         esptool.py --chip esp32 merge_bin \ | ||||||
|           --flash_mode dio \ |           --flash_mode dio \ | ||||||
|           --flash_freq 40m \ |           --flash_freq 40m \ | ||||||
| @@ -40,141 +64,71 @@ jobs: | |||||||
|           0x1000 .pio/build/esp32dev/bootloader.bin \ |           0x1000 .pio/build/esp32dev/bootloader.bin \ | ||||||
|           0x8000 .pio/build/esp32dev/partitions.bin \ |           0x8000 .pio/build/esp32dev/partitions.bin \ | ||||||
|           0x10000 .pio/build/esp32dev/firmware.bin \ |           0x10000 .pio/build/esp32dev/firmware.bin \ | ||||||
|           0x290000 .pio/build/esp32dev/spiffs.bin |           0x3D0000 .pio/build/esp32dev/spiffs.bin | ||||||
|          |          | ||||||
|     - name: Prepare OTA firmware |  | ||||||
|       run: | |  | ||||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin |         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin | ||||||
|  |  | ||||||
|     - name: Get version from tag |  | ||||||
|       id: get_version |  | ||||||
|       run: | |  | ||||||
|         TAG="${GITEA_REF_NAME}" |  | ||||||
|         VERSION="${TAG#v}" |  | ||||||
|         echo "VERSION=$VERSION" >> $GITEA_OUTPUT |  | ||||||
|        |  | ||||||
|     - name: Read CHANGELOG.md |     - name: Read CHANGELOG.md | ||||||
|       id: changelog |       id: changelog | ||||||
|       run: | |       run: | | ||||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} |         VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^v//') | ||||||
|         CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/ {p=0} p" CHANGELOG.md) |         CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/ {p=0} p" CHANGELOG.md) | ||||||
|         echo "CHANGES<<EOF" >> $GITEA_OUTPUT |         echo "CHANGES<<EOF" >> $GITHUB_OUTPUT | ||||||
|         echo "$CHANGELOG" >> $GITEA_OUTPUT |         echo "$CHANGELOG" >> $GITHUB_OUTPUT | ||||||
|         echo "EOF" >> $GITEA_OUTPUT |         echo "EOF" >> $GITHUB_OUTPUT | ||||||
|  |         echo "CHANGELOG CONTENT:" | ||||||
|     - name: Create Gitea Release |         echo "$CHANGELOG" | ||||||
|       env: |         if [ -z "$CHANGELOG" ]; then | ||||||
|         GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} |           echo "No changelog found for version $VERSION" | ||||||
|       run: | |  | ||||||
|         # Debug: Print all environment variables (excluding the token) |  | ||||||
|         env | grep -v "GITEA_TOKEN" |  | ||||||
|          |  | ||||||
|         # Remove trailing slash from server URL if present |  | ||||||
|         SERVER_URL="${GITEA_SERVER_URL%/}" |  | ||||||
|         REPO="${GITEA_REPOSITORY}" |  | ||||||
|         TAG="${GITEA_REF_NAME}" |  | ||||||
|         VERSION="${TAG#v}"  # Remove v prefix if present |  | ||||||
|          |  | ||||||
|         echo "Debug environment:" |  | ||||||
|         echo "Server URL: $SERVER_URL" |  | ||||||
|         echo "Repository: $REPO" |  | ||||||
|         echo "Tag: $TAG" |  | ||||||
|         echo "Version: $VERSION" |  | ||||||
|          |  | ||||||
|         # Test API connectivity |  | ||||||
|         echo "Testing API connectivity..." |  | ||||||
|         TEST_RESPONSE=$(curl -v -k -H "Authorization: token ${GITEA_TOKEN}" "${SERVER_URL}/api/v1/version" 2>&1) |  | ||||||
|         echo "API Test Response:" |  | ||||||
|         echo "$TEST_RESPONSE" |  | ||||||
|          |  | ||||||
|         # Construct clean API URL |  | ||||||
|         API_URL="${SERVER_URL}/api/v1" |  | ||||||
|         RELEASE_URL="${API_URL}/repos/${REPO}/releases" |  | ||||||
|          |  | ||||||
|         echo "Using Release API URL: $RELEASE_URL" |  | ||||||
|          |  | ||||||
|         # Common curl options |  | ||||||
|         CURL_OPTS="-v -k"  # -v for verbose, -k to ignore SSL verification |  | ||||||
|          |  | ||||||
|         # Create release with minimal data first |  | ||||||
|         echo "Creating release..." |  | ||||||
|         RELEASE_RESPONSE=$(curl $CURL_OPTS -X POST \ |  | ||||||
|           -H "accept: application/json" \ |  | ||||||
|           -H "Authorization: token ${GITEA_TOKEN}" \ |  | ||||||
|           -H "Content-Type: application/json" \ |  | ||||||
|           -d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${VERSION}\",\"draft\":false,\"prerelease\":false}" \ |  | ||||||
|           "${RELEASE_URL}" 2>&1) |  | ||||||
|          |  | ||||||
|         echo "Full release creation response (including headers):" |  | ||||||
|         echo "$RELEASE_RESPONSE" |  | ||||||
|          |  | ||||||
|         # Extract the JSON response (last line) |  | ||||||
|         RELEASE_JSON=$(echo "$RELEASE_RESPONSE" | tail -n 1) |  | ||||||
|         echo "Release JSON response:" |  | ||||||
|         echo "$RELEASE_JSON" | jq '.' || echo "Failed to parse JSON response" |  | ||||||
|          |  | ||||||
|         # Get release ID |  | ||||||
|         RELEASE_ID=$(echo "$RELEASE_JSON" | jq -r '.id') |  | ||||||
|          |  | ||||||
|         if [ -z "$RELEASE_ID" ] || [ "$RELEASE_ID" = "null" ]; then |  | ||||||
|           echo "Failed to create release. Full response:" |  | ||||||
|           echo "$RELEASE_RESPONSE" |  | ||||||
|           # Try to get more detailed error information |  | ||||||
|           ERROR_MSG=$(echo "$RELEASE_JSON" | jq -r '.message // .error // "Unknown error"') |  | ||||||
|           echo "Error message: $ERROR_MSG" |  | ||||||
|           exit 1 |           exit 1 | ||||||
|         fi |         fi | ||||||
|  |  | ||||||
|         echo "Successfully created release with ID: $RELEASE_ID" |     - 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}" | ||||||
|          |          | ||||||
|         # Upload assets |         TAG="${GITEA_REF_NAME}" | ||||||
|  |         API_URL="${GITEA_SERVER_URL}/api/v1" | ||||||
|  |         REPO="${GITEA_REPOSITORY}" | ||||||
|  |          | ||||||
|  |         echo "Creating release for ${TAG} on ${REPO}..." | ||||||
|  |          | ||||||
|  |         # Create release | ||||||
|  |         RESPONSE=$(curl -k -s \ | ||||||
|  |           -X POST \ | ||||||
|  |           -H "Authorization: token ${TOKEN}" \ | ||||||
|  |           -H "Content-Type: application/json" \ | ||||||
|  |           -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 | ||||||
|  |           echo "Release created with ID: $RELEASE_ID" | ||||||
|  |            | ||||||
|  |           # Upload files | ||||||
|           for file in "filaman_full.bin" "filaman_ota.bin"; do |           for file in "filaman_full.bin" "filaman_ota.bin"; do | ||||||
|             echo "Uploading $file..." |             echo "Uploading $file..." | ||||||
|           UPLOAD_URL="${RELEASE_URL}/${RELEASE_ID}/assets?name=${file}" |             curl -k -s \ | ||||||
|           echo "Upload URL: $UPLOAD_URL" |               -X POST \ | ||||||
|            |               -H "Authorization: token ${TOKEN}" \ | ||||||
|           UPLOAD_RESPONSE=$(curl $CURL_OPTS -X POST \ |  | ||||||
|             -H "accept: application/json" \ |  | ||||||
|             -H "Authorization: token ${GITEA_TOKEN}" \ |  | ||||||
|               -H "Content-Type: application/octet-stream" \ |               -H "Content-Type: application/octet-stream" \ | ||||||
|             --data-binary "@.pio/build/esp32dev/${file}" \ |               --data-binary "@.pio/build/esp32dev/$file" \ | ||||||
|             "${UPLOAD_URL}" 2>&1) |               "${UPLOAD_URL}?name=$file" | ||||||
|            |           done | ||||||
|           echo "Full upload response for $file (including headers):" |         else | ||||||
|           echo "$UPLOAD_RESPONSE" |           echo "Failed to create release. Response:" | ||||||
|            |           echo "$RESPONSE" | ||||||
|           # Extract the JSON response (last line) |  | ||||||
|           UPLOAD_JSON=$(echo "$UPLOAD_RESPONSE" | tail -n 1) |  | ||||||
|           echo "Upload JSON response:" |  | ||||||
|           echo "$UPLOAD_JSON" | jq '.' || echo "Failed to parse JSON response" |  | ||||||
|            |  | ||||||
|           if ! echo "$UPLOAD_JSON" | jq -e '.id' > /dev/null; then |  | ||||||
|             echo "Failed to upload $file. Full response:" |  | ||||||
|             echo "$UPLOAD_RESPONSE" |  | ||||||
|             ERROR_MSG=$(echo "$UPLOAD_JSON" | jq -r '.message // .error // "Unknown error"') |  | ||||||
|             echo "Error message: $ERROR_MSG" |  | ||||||
|           exit 1 |           exit 1 | ||||||
|         fi |         fi | ||||||
|            |  | ||||||
|           echo "Successfully uploaded $file" |  | ||||||
|         done |  | ||||||
|          |  | ||||||
|         # Update release with full description after successful file upload |  | ||||||
|         echo "Updating release description..." |  | ||||||
|         CHANGELOG='${{ steps.changelog.outputs.CHANGES }}' |  | ||||||
|         UPDATE_RESPONSE=$(curl $CURL_OPTS -X PATCH \ |  | ||||||
|           -H "accept: application/json" \ |  | ||||||
|           -H "Authorization: token ${GITEA_TOKEN}" \ |  | ||||||
|           -H "Content-Type: application/json" \ |  | ||||||
|           -d "{\"body\":$(echo "$CHANGELOG" | jq -R -s .)}" \ |  | ||||||
|           "${RELEASE_URL}/${RELEASE_ID}" 2>&1) |  | ||||||
|          |  | ||||||
|         echo "Full update response (including headers):" |  | ||||||
|         echo "$UPDATE_RESPONSE" |  | ||||||
|          |  | ||||||
|         # Extract the JSON response (last line) |  | ||||||
|         UPDATE_JSON=$(echo "$UPDATE_RESPONSE" | tail -n 1) |  | ||||||
|         echo "Update JSON response:" |  | ||||||
|         echo "$UPDATE_JSON" | jq '.' || echo "Failed to parse JSON response" |  | ||||||
|          |  | ||||||
|         echo "Release process completed" |  | ||||||
| @@ -40,7 +40,7 @@ jobs: | |||||||
|           0x1000 .pio/build/esp32dev/bootloader.bin \ |           0x1000 .pio/build/esp32dev/bootloader.bin \ | ||||||
|           0x8000 .pio/build/esp32dev/partitions.bin \ |           0x8000 .pio/build/esp32dev/partitions.bin \ | ||||||
|           0x10000 .pio/build/esp32dev/firmware.bin \ |           0x10000 .pio/build/esp32dev/firmware.bin \ | ||||||
|           0x290000 .pio/build/esp32dev/spiffs.bin |           0x3D0000 .pio/build/esp32dev/spiffs.bin | ||||||
|  |  | ||||||
|     - name: Prepare OTA firmware |     - name: Prepare OTA firmware | ||||||
|       run: | |       run: | | ||||||
|   | |||||||
							
								
								
									
										27
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										27
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -10,6 +10,9 @@ jobs: | |||||||
|     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 |       - name: Checkout Repository | ||||||
|         uses: actions/checkout@v3 |         uses: actions/checkout@v3 | ||||||
| @@ -20,26 +23,24 @@ jobs: | |||||||
|           echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}" |           echo "GITHUB_ACTIONS=${GITHUB_ACTIONS:-not set}" | ||||||
|           echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}" |           echo "GITEA_ACTIONS=${GITEA_ACTIONS:-not set}" | ||||||
|           echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-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}" |           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: | | ||||||
|           # Initialize provider as unknown |  | ||||||
|           PROVIDER="unknown" |  | ||||||
|            |  | ||||||
|           # Check for Gitea specific environment first |  | ||||||
|           if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then |           if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then | ||||||
|             PROVIDER="gitea" |             echo "provider=gitea" >> "$GITHUB_OUTPUT" | ||||||
|           # Then check for GitHub |             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 |           elif [ "${GITHUB_ACTIONS}" = "true" ]; then | ||||||
|             PROVIDER="github" |             echo "provider=github" >> "$GITHUB_OUTPUT" | ||||||
|  |           else | ||||||
|  |             echo "provider=unknown" >> "$GITHUB_OUTPUT" | ||||||
|           fi |           fi | ||||||
|  |  | ||||||
|           echo "Detected provider: ${PROVIDER}" |  | ||||||
|           echo "provider=${PROVIDER}" >> "${GITHUB_OUTPUT}" |  | ||||||
|  |  | ||||||
|   verify-provider: |   verify-provider: | ||||||
|     needs: route |     needs: route | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
| @@ -61,3 +62,9 @@ jobs: | |||||||
|     needs: [route, verify-provider] |     needs: [route, verify-provider] | ||||||
|     if: needs.route.outputs.provider == 'gitea' |     if: needs.route.outputs.provider == 'gitea' | ||||||
|     uses: ./.github/workflows/providers/gitea-release.yml |     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 }} | ||||||
							
								
								
									
										144
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										144
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,149 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## [1.2.59] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - update version to 1.2.59 and enhance OTA upload handling | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version 1.2.59 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.58] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - update version to 1.2.58 in HTML files and platformio configuration | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.57] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - update version to 1.2.57 in platformio configuration | ||||||
|  |  | ||||||
|  | ### Fixed | ||||||
|  | - update spiffs offset and sizes in firmware and partitions configuration | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.56] - 2025-02-19 | ||||||
|  | ### Added | ||||||
|  | - update version to 1.2.56 and adjust firmware and partition settings | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - remove redundant comment from Gitea release workflow | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [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 | ||||||
|  | ### 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 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.39] - 2025-02-19 | ||||||
|  | ### Added | ||||||
|  | - update Gitea release workflow to use Python virtual environment and increment version to 1.2.39 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.38] - 2025-02-19 | ||||||
|  | ### Added | ||||||
|  | - update Gitea release workflow and increment version to 1.2.38 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.37] - 2025-02-19 | ||||||
|  | ### Added | ||||||
|  | - update Gitea release workflow and increment version to 1.2.37 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.36] - 2025-02-19 | ||||||
|  | ### Added | ||||||
|  | - update Gitea release workflow and increment version to 1.2.36 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.35] - 2025-02-19 | ||||||
|  | ### Added | ||||||
|  | - update Gitea release workflow and version to 1.2.35 | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.34] - 2025-02-19 | ||||||
|  | ### Added | ||||||
|  | - update version to 1.2.34 and enhance Gitea and GitHub release workflows | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.2.33] - 2025-02-19 | ||||||
|  | ### Added | ||||||
|  | - update version to 1.2.33 and refactor release workflows for Gitea and GitHub | ||||||
|  |  | ||||||
|  |  | ||||||
| ## [1.2.32] - 2025-02-19 | ## [1.2.32] - 2025-02-19 | ||||||
| ### Added | ### Added | ||||||
| - update version to 1.2.32 and adjust workflow dependencies for GitHub and Gitea releases | - update version to 1.2.32 and adjust workflow dependencies for GitHub and Gitea releases | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.29</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ | |||||||
| ; https://docs.platformio.org/page/projectconf.html | ; https://docs.platformio.org/page/projectconf.html | ||||||
|  |  | ||||||
| [common] | [common] | ||||||
| version = "1.2.32" | version = "1.2.59" | ||||||
|  |  | ||||||
| [env:esp32dev] | [env:esp32dev] | ||||||
| platform = espressif32 | platform = espressif32 | ||||||
|   | |||||||
| @@ -16,15 +16,19 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind | |||||||
|             return; |             return; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         if (!Update.begin(contentLength)) { |         // Determine if this is a full image (firmware + SPIFFS) or just firmware | ||||||
|  |         bool isFullImage = (contentLength > 0x3D0000); // SPIFFS starts at 0x3D0000 | ||||||
|  |  | ||||||
|  |         if (!Update.begin(contentLength, isFullImage ? U_FLASH : U_SPIFFS)) { | ||||||
|             Serial.printf("Not enough space: %u required\n", contentLength); |             Serial.printf("Not enough space: %u required\n", contentLength); | ||||||
|             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}"); |             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}"); | ||||||
|             return; |             return; | ||||||
|         } |         } | ||||||
|          |          | ||||||
|         Serial.println("Update started"); |         Serial.println(isFullImage ? "Full image update started" : "Firmware update started"); | ||||||
|     } |     } | ||||||
|      |      | ||||||
|  |     // Write chunk to flash | ||||||
|     if (Update.write(data, len) != len) { |     if (Update.write(data, len) != len) { | ||||||
|         Update.printError(Serial); |         Update.printError(Serial); | ||||||
|         request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}"); |         request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}"); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user