mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2025-09-22 15:57:00 +02:00
Fix changelog merges
This commit is contained in:
2
.gitattributes
vendored
2
.gitattributes
vendored
@@ -3,4 +3,4 @@
|
||||
*.ps1 eol=crlf
|
||||
*.cmd eol=crlf
|
||||
ReadMe.md merge=ours
|
||||
ChangeLog.md merge=ours
|
||||
CHANGELOG.md merge=ours
|
||||
|
2
.github/workflow_data/devbuild.py
vendored
2
.github/workflow_data/devbuild.py
vendored
@@ -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:",
|
||||
|
2
.github/workflow_data/release.py
vendored
2
.github/workflow_data/release.py
vendored
@@ -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'
|
||||
|
Reference in New Issue
Block a user