From 2f5c23c4463c8043f1822398c5a763684944cff8 Mon Sep 17 00:00:00 2001 From: Sergei Petrosian Date: Thu, 27 Jul 2023 10:13:26 +0200 Subject: [PATCH 1/2] As part of creating new release, convert README.md to html Keeping README.html in each role's root dir would help to have a consistent README.html in all RHEL versions. Downstream, we can process this to replace upstream terms. See RHELPLAN-158622 --- role-make-version-changelog.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/role-make-version-changelog.sh b/role-make-version-changelog.sh index 1f4b6120..05109541 100755 --- a/role-make-version-changelog.sh +++ b/role-make-version-changelog.sh @@ -306,9 +306,12 @@ You have three options: cat "$rel_notes_file" CHANGELOG.md > .tmp-changelog fi mv .tmp-changelog CHANGELOG.md - git add CHANGELOG.md + # Expecting that this script is run from the cloned auto-maintenance repo + SCRIPT_DIR="$(dirname -- "$0")" + md2html_tool=pandoc sh "$SCRIPT_DIR"/md2html.sh README.md + git add CHANGELOG.md README.html { echo "docs(changelog): version $new_tag [citest skip]"; echo ""; - echo "Create changelog update and release for version $new_tag"; } > .gitcommitmsg + echo "Update changelog and README.html for version $new_tag"; } > .gitcommitmsg git commit -s -F .gitcommitmsg rm -f .gitcommitmsg "$rel_notes_file" "$new_features_file" \ "$bug_fixes_file" "$other_changes_file" "$pr_titles_file" \ From e708aef84319c7ad8fb7c9dc5e17ea499676ac26 Mon Sep 17 00:00:00 2001 From: Sergei Petrosian Date: Tue, 15 Aug 2023 12:11:23 +0200 Subject: [PATCH 2/2] Get .README.html from docs branch from latest/README.html --- role-make-version-changelog.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/role-make-version-changelog.sh b/role-make-version-changelog.sh index 05109541..a37045f1 100755 --- a/role-make-version-changelog.sh +++ b/role-make-version-changelog.sh @@ -306,12 +306,10 @@ You have three options: cat "$rel_notes_file" CHANGELOG.md > .tmp-changelog fi mv .tmp-changelog CHANGELOG.md - # Expecting that this script is run from the cloned auto-maintenance repo - SCRIPT_DIR="$(dirname -- "$0")" - md2html_tool=pandoc sh "$SCRIPT_DIR"/md2html.sh README.md - git add CHANGELOG.md README.html + git show origin/docs:latest/README.html > .README.html + git add CHANGELOG.md .README.html { echo "docs(changelog): version $new_tag [citest skip]"; echo ""; - echo "Update changelog and README.html for version $new_tag"; } > .gitcommitmsg + echo "Update changelog and .README.html for version $new_tag"; } > .gitcommitmsg git commit -s -F .gitcommitmsg rm -f .gitcommitmsg "$rel_notes_file" "$new_features_file" \ "$bug_fixes_file" "$other_changes_file" "$pr_titles_file" \