Compare commits
	
		
			8 Commits
		
	
	
		
			v1.3.23
			...
			946202de0e
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 946202de0e | |||
| 41a3717347 | |||
| 255c820439 | |||
| aef3ba77ba | |||
| 2592c3a497 | |||
| a48c5dfef0 | |||
| 00554d0b09 | |||
| 05a91cd8d8 | 
							
								
								
									
										30
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										30
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -71,12 +71,36 @@ jobs: | |||||||
|         echo "$CHANGELOG" >> $GITHUB_OUTPUT |         echo "$CHANGELOG" >> $GITHUB_OUTPUT | ||||||
|         echo "EOF" >> $GITHUB_OUTPUT |         echo "EOF" >> $GITHUB_OUTPUT | ||||||
|  |  | ||||||
|  |     - 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 |     - name: Create Gitea Release | ||||||
|       env: |       env: | ||||||
|         GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} |         GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} | ||||||
|         GITEA_API_URL: ${{ secrets.GITEA_API_URL }} |         GITEA_API_URL: ${{ steps.gitea_url.outputs.GITEA_API_URL }} | ||||||
|         GITEA_REPO: ${{ secrets.GITEA_REPO }} |         GITEA_REPO: ${{ steps.gitea_url.outputs.GITEA_REPO }} | ||||||
|         GITEA_OWNER: ${{ secrets.GITEA_OWNER }} |         GITEA_OWNER: ${{ steps.gitea_url.outputs.GITEA_OWNER }} | ||||||
|       run: | |       run: | | ||||||
|         VERSION=${{ steps.get_version.outputs.VERSION }} |         VERSION=${{ steps.get_version.outputs.VERSION }} | ||||||
|         cd .pio/build/esp32dev |         cd .pio/build/esp32dev | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -115,12 +115,12 @@ jobs: | |||||||
|         FILES_TO_UPLOAD="" |         FILES_TO_UPLOAD="" | ||||||
|          |          | ||||||
|         # Always add firmware |         # 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" |           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 "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" |           FILES_TO_UPLOAD="$FILES_TO_UPLOAD upgrade_filaman_website_v${VERSION}.bin" | ||||||
|         fi |         fi | ||||||
|          |          | ||||||
|   | |||||||
							
								
								
									
										16
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,21 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## [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 | ## [1.3.23] - 2025-02-21 | ||||||
| ### Changed | ### Changed | ||||||
| - update webpages for version v1.3.23 | - update webpages for version v1.3.23 | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ | |||||||
| ; https://docs.platformio.org/page/projectconf.html | ; https://docs.platformio.org/page/projectconf.html | ||||||
|  |  | ||||||
| [common] | [common] | ||||||
| version = "1.3.23" | version = "1.3.25" | ||||||
|  |  | ||||||
| #test | #test | ||||||
|  |  | ||||||
|   | |||||||
| @@ -122,29 +122,29 @@ def update_changelog(): | |||||||
|                 f.write(updated_content) |                 f.write(updated_content) | ||||||
|             push_changes(version) |             push_changes(version) | ||||||
|         else: |         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}}" |             version_pattern = f"## \\[{version}\\] - \\d{{4}}-\\d{{2}}-\\d{{2}}" | ||||||
|             next_version_pattern = "## \\[.*?\\] - \\d{4}-\\d{2}-\\d{2}" |             next_version_pattern = "## \\[.*?\\] - \\d{4}-\\d{2}-\\d{2}" | ||||||
|              |              | ||||||
|             # Finde den Start der aktuellen Version |             # Finde den Start der aktuellen Version | ||||||
|             version_match = re.search(version_pattern, content) |             version_match = re.search(version_pattern, content) | ||||||
|             if version_match: |             if version_match: | ||||||
|                 version_start = version_match.end() |                 version_start = version_match.start() | ||||||
|                 # Suche nach der nächsten Version |                 # 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: |                 if next_version_match: | ||||||
|                     # Füge zwischen aktueller und nächster Version ein |                     # Ersetze den Inhalt zwischen aktueller und nächster Version | ||||||
|                     insert_pos = version_start + next_version_match.start() |                     next_version_pos = version_start + 1 + next_version_match.start() | ||||||
|                     updated_content = content[:insert_pos] + "\n" + changelog_entry + content[insert_pos:] |                     updated_content = content[:version_start] + changelog_entry + content[next_version_pos:] | ||||||
|                 else: |                 else: | ||||||
|                     # Füge am Ende des Abschnitts ein |                     # Wenn keine nächste Version existiert, ersetze bis zum Ende | ||||||
|                     updated_content = content[:version_start] + "\n" + changelog_entry + content[version_start:] |                     updated_content = content[:version_start] + changelog_entry + "\n" | ||||||
|                  |                  | ||||||
|                 with open(changelog_path, 'w') as f: |                 with open(changelog_path, 'w') as f: | ||||||
|                     f.write(updated_content) |                     f.write(updated_content) | ||||||
|                 push_changes(version) |                 push_changes(version) | ||||||
|                 print(f"Added new entries to existing version {version}") |                 print(f"Updated entries for version {version}") | ||||||
|  |  | ||||||
| if __name__ == "__main__": | if __name__ == "__main__": | ||||||
|     update_changelog() |     update_changelog() | ||||||
		Reference in New Issue
	
	Block a user