diff --git a/scripts/release/create_minor_release_PR_commit.sh b/scripts/release/create_minor_release_PR_commit.sh index fe60504a4e3..11d56991e13 100755 --- a/scripts/release/create_minor_release_PR_commit.sh +++ b/scripts/release/create_minor_release_PR_commit.sh @@ -83,29 +83,13 @@ sed -i.bak "s/FILE reverse-dev.sql)/FILE ${DOWNGRADE_FILE})/g" CMakeLists.txt rm CMakeLists.txt.bak -#delete Features section from the templates and create this version's CHANGELOG.md -#Undo the deletion, from the template files. echo "---- Creating CHANGELOG_"$NEW_VERSION".md file ----" -cd ~/"$SOURCES_DIR"/"$FORK_DIR" -cd .unreleased - -head -n 12 RELEASE_NOTES_HEADER.md.j2 > RELEASE_NOTES_HEADER.md.j2.tmp -mv RELEASE_NOTES_HEADER.md.j2.tmp RELEASE_NOTES_HEADER.md.j2 - -head -n 12 template.release_notes_header.j2 > template.release_notes_header.j2.tmp -mv template.release_notes_header.j2.tmp template.release_notes_header.j2 - rm -f ~/CHANGELOG_"$NEW_VERSION".md cd ~/"$SOURCES_DIR"/"$FORK_DIR" ./scripts/merge_changelogs.sh > ~/CHANGELOG_"$NEW_VERSION".md -cd .unreleased -rm RELEASE_NOTES_HEADER.md.j2 template.release_notes_header.j2 -git checkout RELEASE_NOTES_HEADER.md.j2 template.release_notes_header.j2 - - echo "---- Editing the CHANGELOG.md file with the contents of CHANGELOG_"$NEW_VERSION".md file. ----" cd ~/"$SOURCES_DIR"/"$FORK_DIR" diff --git a/scripts/release/create_release_PR_commit.sh b/scripts/release/create_release_PR_commit.sh index 8e927fcfcd9..ce412113eac 100755 --- a/scripts/release/create_release_PR_commit.sh +++ b/scripts/release/create_release_PR_commit.sh @@ -86,29 +86,13 @@ sed -i.bak "s/FILE ${LAST_DOWNGRADE_FILE})/FILE ${DOWNGRADE_FILE})/g" CMakeLists rm CMakeLists.txt.bak -#delete Features section from the templates and create this version's CHANGELOG.md -#Undo the deletion, from the template files. echo "---- Creating CHANGELOG_"$NEW_VERSION".md file ----" -cd ~/"$SOURCES_DIR"/"$FORK_DIR" -cd .unreleased - -head -n 12 RELEASE_NOTES_HEADER.md.j2 > RELEASE_NOTES_HEADER.md.j2.tmp -mv RELEASE_NOTES_HEADER.md.j2.tmp RELEASE_NOTES_HEADER.md.j2 - -head -n 12 template.release_notes_header.j2 > template.release_notes_header.j2.tmp -mv template.release_notes_header.j2.tmp template.release_notes_header.j2 - rm -f ~/CHANGELOG_"$NEW_VERSION".md cd ~/"$SOURCES_DIR"/"$FORK_DIR" ./scripts/merge_changelogs.sh > ~/CHANGELOG_"$NEW_VERSION".md -cd .unreleased -rm RELEASE_NOTES_HEADER.md.j2 template.release_notes_header.j2 -git checkout RELEASE_NOTES_HEADER.md.j2 template.release_notes_header.j2 - - echo "---- Editing the CHANGELOG.md file with the contents of CHANGELOG_"$NEW_VERSION".md file. ----" cd ~/"$SOURCES_DIR"/"$FORK_DIR"