Compare commits
	
		
			9 Commits
		
	
	
		
			v1.3.27
			...
			7e53e1ccb0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 7e53e1ccb0 | |||
| e49e812b13 | |||
| b1e0fcfadf | |||
| 31ef3ac8df | |||
| 8cf3f87c89 | |||
| c446188311 | |||
| 8e2a8d597d | |||
| 7d3b1c34f6 | |||
| b95c61118b | 
							
								
								
									
										73
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										73
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -40,8 +40,9 @@ jobs: | ||||
|         # 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 SPIFFS binary with magic byte | ||||
|         echo -ne '\xEA' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||
|         cat .pio.build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||
|          | ||||
|         # Create full binary | ||||
|         (cd .pio/build/esp32dev &&  | ||||
| @@ -120,48 +121,46 @@ jobs: | ||||
|         echo "Debug: API URL: ${GITEA_API_URL}" | ||||
|         echo "Debug: Repository: ${GITEA_OWNER}/${GITEA_REPO}" | ||||
|          | ||||
|         # 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" | ||||
|             echo "Debug: Found file: $file" | ||||
|           fi | ||||
|         done | ||||
|  | ||||
|         # Test API connection with explicit token header | ||||
|         echo "Debug: Testing API connection..." | ||||
|         TEST_RESPONSE=$(curl -s -w "\n%{http_code}" \ | ||||
|           -H "Authorization: token ${GITEA_TOKEN}" \ | ||||
|           "${GITEA_API_URL}/api/v1/version") | ||||
|         TEST_STATUS=$(echo "$TEST_RESPONSE" | tail -n1) | ||||
|         if [ "$TEST_STATUS" != "200" ]; then | ||||
|           echo "Error: Cannot connect to Gitea API" | ||||
|           echo "Response: $TEST_RESPONSE" | ||||
|           exit 1 | ||||
|         fi | ||||
|  | ||||
|         # Create release using API | ||||
|         # Erstelle zuerst den Release ohne Dateien | ||||
|         echo "Debug: Creating release..." | ||||
|         RELEASE_DATA="{ | ||||
|           \"tag_name\": \"v${VERSION}\", | ||||
|           \"name\": \"v${VERSION}\", | ||||
|           \"body\": \"${{ steps.changelog.outputs.CHANGES }}\" | ||||
|         }" | ||||
|         RELEASE_DATA="{\"tag_name\":\"v${VERSION}\",\"name\":\"v${VERSION}\",\"body\":\"${{ steps.changelog.outputs.CHANGES }}\"}" | ||||
|          | ||||
|         # Create release with explicit token header | ||||
|         RESPONSE=$(curl -s -w "\n%{http_code}" \ | ||||
|         RELEASE_RESPONSE=$(curl -s -w "\n%{http_code}" \ | ||||
|           -X POST \ | ||||
|           -H "Authorization: token ${GITEA_TOKEN}" \ | ||||
|           -H "Content-Type: application/json" \ | ||||
|           -d "$RELEASE_DATA" \ | ||||
|           -d "${RELEASE_DATA}" \ | ||||
|           "${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases") | ||||
|          | ||||
|         HTTP_STATUS=$(echo "$RESPONSE" | tail -n1) | ||||
|         RESPONSE_BODY=$(echo "$RESPONSE" | head -n -1) | ||||
|         RELEASE_STATUS=$(echo "$RELEASE_RESPONSE" | tail -n1) | ||||
|         RELEASE_BODY=$(echo "$RELEASE_RESPONSE" | head -n -1) | ||||
|          | ||||
|         echo "Debug: HTTP Status: $HTTP_STATUS" | ||||
|         if [ "$HTTP_STATUS" != "201" ]; then | ||||
|         if [ "$RELEASE_STATUS" != "201" ]; then | ||||
|           echo "Error: Failed to create release" | ||||
|           echo "Response: $RESPONSE_BODY" | ||||
|           echo "Response: $RELEASE_BODY" | ||||
|           exit 1 | ||||
|         fi | ||||
|          | ||||
|         # Extrahiere die Release-ID aus der Antwort | ||||
|         RELEASE_ID=$(echo "$RELEASE_BODY" | grep -o '"id":[0-9]*' | cut -d':' -f2) | ||||
|          | ||||
|         # Lade die Dateien einzeln hoch | ||||
|         for file in upgrade_filaman_firmware_v${VERSION}.bin upgrade_filaman_website_v${VERSION}.bin filaman_full_${VERSION}.bin; do | ||||
|           if [ -f "$file" ]; then | ||||
|             echo "Debug: Uploading $file..." | ||||
|             UPLOAD_RESPONSE=$(curl -s -w "\n%{http_code}" \ | ||||
|               -X POST \ | ||||
|               -H "Authorization: token ${GITEA_TOKEN}" \ | ||||
|               -H "Content-Type: application/octet-stream" \ | ||||
|               --data-binary @"$file" \ | ||||
|               "${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases/${RELEASE_ID}/assets?name=${file}") | ||||
|              | ||||
|             UPLOAD_STATUS=$(echo "$UPLOAD_RESPONSE" | tail -n1) | ||||
|             if [ "$UPLOAD_STATUS" != "201" ]; then | ||||
|               echo "Warning: Failed to upload $file" | ||||
|               echo "Response: $(echo "$UPLOAD_RESPONSE" | head -n -1)" | ||||
|             else | ||||
|               echo "Successfully uploaded $file" | ||||
|             fi | ||||
|           fi | ||||
|         done | ||||
							
								
								
									
										5
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -69,8 +69,9 @@ jobs: | ||||
|         # Copy firmware binary | ||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin | ||||
|          | ||||
|         # Always create SPIFFS binary | ||||
|         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||
|         # Create SPIFFS binary with magic byte | ||||
|         echo -ne '\xEA' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||
|         cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||
|          | ||||
|         # Create full binary (always) | ||||
|         (cd .pio/build/esp32dev &&  | ||||
|   | ||||
							
								
								
									
										18
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,23 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## [1.3.30] - 2025-02-22 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.30 | ||||
| - workflow: update Gitea and GitHub release workflows to create SPIFFS binary with magic byte | ||||
|  | ||||
|  | ||||
| ## [1.3.29] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.29 | ||||
| - workflow: update Gitea release workflow to create release before file uploads | ||||
|  | ||||
|  | ||||
| ## [1.3.28] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.28 | ||||
| - workflow: update Gitea release workflow to use file uploads with curl | ||||
|  | ||||
|  | ||||
| ## [1.3.27] - 2025-02-21 | ||||
| ### Added | ||||
| - workflow: add GITEA_TOKEN secret for Gitea API access in release workflows | ||||
|   | ||||
| @@ -167,12 +167,12 @@ | ||||
|             } | ||||
|  | ||||
|             // Validate file name pattern | ||||
|             if (updateType === 'firmware' && !file.name.startsWith('filaman_')) { | ||||
|                 alert('Please select a valid firmware file (filaman_*.bin)'); | ||||
|             if (updateType === 'firmware' && !file.name.startsWith('upgrade_filaman_firmware_')) { | ||||
|                 alert('Please select a valid firmware file (upgrade_filaman_firmware_*.bin)'); | ||||
|                 return; | ||||
|             } | ||||
|             if (updateType === 'webpage' && !file.name.startsWith('webpage_')) { | ||||
|                 alert('Please select a valid webpage file (webpage_*.bin)'); | ||||
|             if (updateType === 'webpage' && !file.name.startsWith('upgrade_filaman_website_')) { | ||||
|                 alert('Please select a valid webpage file (upgrade_filaman_website_*.bin)'); | ||||
|                 return; | ||||
|             } | ||||
|              | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
| ; https://docs.platformio.org/page/projectconf.html | ||||
|  | ||||
| [common] | ||||
| version = "1.3.27" | ||||
| version = "1.3.30" | ||||
|  | ||||
| #test | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user