Fix changelog merges

This commit is contained in:
Willy-JL
2024-07-05 17:31:00 +02:00
parent 4c7b0f3863
commit 967c16d52e
4 changed files with 3 additions and 3 deletions

2
.gitattributes vendored
View File

@@ -3,4 +3,4 @@
*.ps1 eol=crlf
*.cmd eol=crlf
ReadMe.md merge=ours
ChangeLog.md merge=ours
CHANGELOG.md merge=ours

View File

@@ -48,7 +48,7 @@ if __name__ == "__main__":
},
{
"name": "Changelog since last release:",
"value": f"[Changes since {release}]({event['repository']['html_url']}/blob/{after}/ChangeLog.md)"
"value": f"[Changes since {release}]({event['repository']['html_url']}/blob/{after}/CHANGELOG.md)"
},
{
"name": "Download artifacts:",

View File

@@ -15,7 +15,7 @@ if __name__ == "__main__":
).json()
version_tag = release["tag_name"]
with open("ChangeLog.md", "r") as f:
with open("CHANGELOG.md", "r") as f:
changelog = f.read()
notes_path = '.github/workflow_data/release.md'