tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release.sh: don't mess the mainline Changelog with commits in maint

Browse Source 
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Nicolas Sebrecht 2016-07-22 17:35:54 +02:00
parent 63f0622d41
commit e02f1491c9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/release.sh
View File

@ -431,7 +431,6 @@ function run () {
check_dirty check_dirty
prepare_env prepare_env
checkout_next checkout_next
merge_maint
clear clear
welcome welcome
@ -456,8 +455,12 @@ function run () {
build_announce "$new_version" "$previous_version" build_announce "$new_version" "$previous_version"
edit_announce edit_announce
# Wait for the mainline and announce to be built to not include commits from
# maint.
merge_maint
git_release $new_version git_release $new_version
# Wait for all the Changelogs to be up-to-date in next.
update_website $new_version update_website $new_version
} }