From 3af4b14da5d40381582dc3f3681c0857d3c6cd53 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 22 May 2020 18:28:35 -0400 Subject: [PATCH] updated version and minor improvement --- production/feisty_meow_config.ini | 2 +- scripts/rev_control/quick_git_release.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini index 21aec05f..0edd66d7 100644 --- a/production/feisty_meow_config.ini +++ b/production/feisty_meow_config.ini @@ -3,7 +3,7 @@ # specifies the version of the code that is being constructed here. major=2 minor=140 -revision=117 +revision=118 build=420 # specifies the remainder of the version record info. diff --git a/scripts/rev_control/quick_git_release.sh b/scripts/rev_control/quick_git_release.sh index bb914da1..654b0aba 100644 --- a/scripts/rev_control/quick_git_release.sh +++ b/scripts/rev_control/quick_git_release.sh @@ -94,11 +94,16 @@ echo merging in from release branch to dev--hit enter read line git merge --no-ff $new_release exit_on_error merging the release changes into the dev branch +echo pushing merged dev branch up + git push + exit_on_error pushing merged dev branch up + + # done with the serious actions. + echo -e '\ncompleted the release of version $new_version\n' + # back to where we started. popd } - make_new_feisty_meow_release "$1" - -- 2.34.1