Compare commits
	
		
			20 Commits
		
	
	
		
			v1.3.20
			...
			36d50cbe7f
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 36d50cbe7f | |||
| 9148d207c7 | |||
| 5f6fef9448 | |||
| 946202de0e | |||
| 41a3717347 | |||
| 255c820439 | |||
| aef3ba77ba | |||
| 2592c3a497 | |||
| a48c5dfef0 | |||
| 00554d0b09 | |||
| 05a91cd8d8 | |||
| 7cf113eaff | |||
| 44d27adab2 | |||
| e0a2dff5fe | |||
| 519a089684 | |||
| ef053bb2b6 | |||
| 0a91c7b269 | |||
| 875d9d2b70 | |||
| 52840b9b0b | |||
| da1fc7678f | 
							
								
								
									
										82
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										82
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -71,19 +71,93 @@ jobs: | ||||
|         echo "$CHANGELOG" >> $GITHUB_OUTPUT | ||||
|         echo "EOF" >> $GITHUB_OUTPUT | ||||
|  | ||||
|     - name: Create Gitea Release | ||||
|     - name: Determine Gitea URL | ||||
|       id: gitea_url | ||||
|       run: | | ||||
|         echo "Debug Environment:" | ||||
|         echo "GITHUB_SERVER_URL=${GITHUB_SERVER_URL:-not set}" | ||||
|         echo "GITEA_SERVER_URL=${GITEA_SERVER_URL:-not set}" | ||||
|         echo "GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-not set}" | ||||
|         echo "GITEA_REPOSITORY=${GITEA_REPOSITORY:-not set}" | ||||
|         echo "RUNNER_NAME=${RUNNER_NAME:-not set}" | ||||
|          | ||||
|         # Set API URL based on environment | ||||
|         if [ -n "${GITEA_ACTIONS}" ] || [ -n "${GITEA_REPOSITORY}" ] || [[ "${RUNNER_NAME}" == *"gitea"* ]]; then | ||||
|           GITEA_API_URL="${GITHUB_SERVER_URL}" | ||||
|           GITEA_REPO=$(echo "${GITHUB_REPOSITORY}" | cut -d'/' -f2) | ||||
|           GITEA_OWNER=$(echo "${GITHUB_REPOSITORY}" | cut -d'/' -f1) | ||||
|         else | ||||
|           echo "Error: This workflow is only for Gitea" | ||||
|           exit 1 | ||||
|         fi | ||||
|          | ||||
|         echo "GITEA_API_URL=${GITEA_API_URL}" >> $GITHUB_OUTPUT | ||||
|         echo "GITEA_REPO=${GITEA_REPO}" >> $GITHUB_OUTPUT | ||||
|         echo "GITEA_OWNER=${GITEA_OWNER}" >> $GITHUB_OUTPUT | ||||
|  | ||||
|     - name: Create Gitea Release | ||||
|       env: | ||||
|         GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} | ||||
|         GITEA_API_URL: ${{ steps.gitea_url.outputs.GITEA_API_URL }} | ||||
|         GITEA_REPO: ${{ steps.gitea_url.outputs.GITEA_REPO }} | ||||
|         GITEA_OWNER: ${{ steps.gitea_url.outputs.GITEA_OWNER }} | ||||
|       run: | | ||||
|         # Debug Token (nur Länge ausgeben für Sicherheit) | ||||
|         echo "Debug: Token length: ${#GITEA_TOKEN}" | ||||
|         if [ -z "$GITEA_TOKEN" ]; then | ||||
|           echo "Error: GITEA_TOKEN is empty" | ||||
|           exit 1 | ||||
|         fi | ||||
|  | ||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} | ||||
|         cd .pio/build/esp32dev | ||||
|          | ||||
|         # Debug-Ausgaben | ||||
|         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 | ||||
|         echo "Debug: Creating release..." | ||||
|         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}" \ | ||||
|           -X POST \ | ||||
|           -H "Authorization: token ${GITEA_TOKEN}" \ | ||||
|           -H "Content-Type: application/json" \ | ||||
|           -d "$RELEASE_DATA" \ | ||||
|           "${GITEA_API_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases") | ||||
|          | ||||
|         # Create release using git command | ||||
|         git tag -a "v${VERSION}" -m "Release ${VERSION}" | ||||
|         git push origin "v${VERSION}" | ||||
|         HTTP_STATUS=$(echo "$RESPONSE" | tail -n1) | ||||
|         RESPONSE_BODY=$(echo "$RESPONSE" | head -n -1) | ||||
|  | ||||
|         echo "Debug: HTTP Status: $HTTP_STATUS" | ||||
|         if [ "$HTTP_STATUS" != "201" ]; then | ||||
|           echo "Error: Failed to create release" | ||||
|           echo "Response: $RESPONSE_BODY" | ||||
|           exit 1 | ||||
							
								
								
									
										4
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -115,12 +115,12 @@ jobs: | ||||
|         FILES_TO_UPLOAD="" | ||||
|          | ||||
|         # Always add firmware | ||||
|         if [ -f "update_filaman_firmware_v${VERSION}.bin" ]; then | ||||
|         if [ -f "upgrade_filaman_firmware_v${VERSION}.bin" ]; then | ||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_firmware_v${VERSION}.bin" | ||||
|         fi | ||||
|          | ||||
|         # Add SPIFFS and full binary only if they exist | ||||
|         if [ -f "update_filaman_website_v${VERSION}.bin" ]; then | ||||
|         if [ -f "upgrade_filaman_website_v${VERSION}.bin" ]; then | ||||
|           FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin" | ||||
|         fi | ||||
|          | ||||
|   | ||||
							
								
								
									
										46
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										46
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,51 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## [1.3.26] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.26 | ||||
|  | ||||
| ### Fixed | ||||
| - workflow: improve Gitea release workflow with enhanced error handling and debug outputs | ||||
|  | ||||
|  | ||||
| ## [1.3.25] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.25 | ||||
| - workflow: update Gitea release workflow to include RUNNER_NAME and improve error handling | ||||
|  | ||||
|  | ||||
| ## [1.3.24] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.24 | ||||
| - workflow: rename update files to upgrade in GitHub release workflow | ||||
| - workflow: aktualisiere bestehende Einträge im Changelog für vorhandene Versionen | ||||
|  | ||||
| ### Fixed | ||||
| - workflow: improve Gitea release process with dynamic URL determination and debug outputs | ||||
|  | ||||
|  | ||||
| ## [1.3.23] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.23 | ||||
|  | ||||
| ### Fixed | ||||
| - workflow: enhance Gitea release process with debug outputs and API connection checks | ||||
|  | ||||
|  | ||||
| ## [1.3.22] - 2025-02-21 | ||||
| ### Added | ||||
| - workflow: improve Gitea release process with additional environment variables and error handling | ||||
|  | ||||
| ### Changed | ||||
| - update webpages for version v1.3.22 | ||||
|  | ||||
|  | ||||
| ## [1.3.21] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.21 | ||||
| - workflow: enhance Gitea release process with API integration and token management | ||||
|  | ||||
|  | ||||
| ## [1.3.20] - 2025-02-21 | ||||
| ### Changed | ||||
| - update webpages for version v1.3.20 | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
| ; https://docs.platformio.org/page/projectconf.html | ||||
|  | ||||
| [common] | ||||
| version = "1.3.20" | ||||
| version = "1.3.26" | ||||
|  | ||||
| #test | ||||
|  | ||||
|   | ||||
| @@ -122,29 +122,29 @@ def update_changelog(): | ||||
|                 f.write(updated_content) | ||||
|             push_changes(version) | ||||
|         else: | ||||
|             # Version existiert bereits, füge neue Einträge unter der existierenden Version ein | ||||
|             # Version existiert bereits, aktualisiere die bestehenden Einträge | ||||
|             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() | ||||
|                 version_start = version_match.start() | ||||
|                 # Suche nach der nächsten Version | ||||
|                 next_version_match = re.search(next_version_pattern, content[version_start:]) | ||||
|                 next_version_match = re.search(next_version_pattern, content[version_start + 1:]) | ||||
|                  | ||||
|                 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:] | ||||
|                     # Ersetze den Inhalt zwischen aktueller und nächster Version | ||||
|                     next_version_pos = version_start + 1 + next_version_match.start() | ||||
|                     updated_content = content[:version_start] + changelog_entry + content[next_version_pos:] | ||||
|                 else: | ||||
|                     # Füge am Ende des Abschnitts ein | ||||
|                     updated_content = content[:version_start] + "\n" + changelog_entry + content[version_start:] | ||||
|                     # Wenn keine nächste Version existiert, ersetze bis zum Ende | ||||
|                     updated_content = content[:version_start] + changelog_entry + "\n" | ||||
|                  | ||||
|                 with open(changelog_path, 'w') as f: | ||||
|                     f.write(updated_content) | ||||
|                 push_changes(version) | ||||
|                 print(f"Added new entries to existing version {version}") | ||||
|                 print(f"Updated entries for version {version}") | ||||
|  | ||||
| if __name__ == "__main__": | ||||
|     update_changelog() | ||||
		Reference in New Issue
	
	Block a user