diff --git a/scripts/ci/generate_source_metadata.py b/scripts/ci/generate_source_metadata.py index 61cbfa12..e881655e 100644 --- a/scripts/ci/generate_source_metadata.py +++ b/scripts/ci/generate_source_metadata.py @@ -140,15 +140,7 @@ def main(): formatted = now.strftime("%Y-%m-%dT%H:%M:%SZ") human = now.strftime("%c") - localized_description = textwrap.dedent(f""" - This is release for: - - version: "{args.marketing_version}" - - revision: "{args.short_commit}" - - timestamp: "{human}" - - Release Notes: - {notes} - """).strip() + localized_description = getFormattedLocalizedDescription(args.marketing_version, args.short_commit, human, notes) metadata = { "is_beta": bool(args.is_beta), @@ -170,6 +162,16 @@ def main(): print(f"Wrote {out_file}") +def getFormattedLocalizedDescription(marketing_version, short_commit, human, notes): + return f""" +This is release for: + - version: "{marketing_version}" + - revision: "{short_commit}" + - timestamp: "{human}" + +Release Notes: +{notes} +""".lstrip("\n") if __name__ == "__main__": - main() \ No newline at end of file + main() diff --git a/scripts/ci/workflow.py b/scripts/ci/workflow.py index ee47755b..eeb3f3e6 100644 --- a/scripts/ci/workflow.py +++ b/scripts/ci/workflow.py @@ -408,20 +408,7 @@ def upload_release(release_name, release_tag, commit_sha, repo, upstream_recomme if upstream_recommendation and upstream_recommendation.strip(): upstream_block = f"{upstream_recommendation.strip()}\n\n" - raw_body = f""" - This is an ⚠️ **EXPERIMENTAL** ⚠️ {release_name} build for commit [{commit_sha}](https://github.com/{repo}/commit/{commit_sha}). - - {release_name} builds are **extremely experimental builds only meant to be used by developers and beta testers. They often contain bugs and experimental features. Use at your own risk!** - - {upstream_block}## Build Info - - Built at (UTC): `{built_time}` - Built at (UTC date): `{built_date}` - Commit SHA: `{commit_sha}` - Version: `{marketing_version}` - """ - - header = inspect.cleandoc(raw_body) + header = getFormattedUploadMsg(release_name, release_tag, commit_sha, repo, upstream_block, built_time, built_date, marketing_version) body = header + "\n\n" + release_notes.lstrip() + "\n" body_file = ROOT / "release_body.md" @@ -442,6 +429,20 @@ def upload_release(release_name, release_tag, commit_sha, repo, upstream_recomme f'--clobber' ) +def getFormattedUploadMsg(release_name, release_tag, commit_sha, repo, upstream_block, built_time, built_date, marketing_version): + return f""" +This is an ⚠️ **EXPERIMENTAL** ⚠️ {release_name} build for commit [{commit_sha}](https://github.com/{repo}/commit/{commit_sha}). + +{release_name} builds are **extremely experimental builds only meant to be used by developers and beta testers. They often contain bugs and experimental features. Use at your own risk!** + +{upstream_block}## Build Info + +Built at (UTC): `{built_time}` +Built at (UTC date): `{built_date}` +Commit SHA: `{commit_sha}` +Version: `{marketing_version}` +""".lstrip("\n") + # ---------------------------------------------------------- # ENTRYPOINT # ----------------------------------------------------------