From 22329d9d30d4fc19b581b178abc583ace4454dd2 Mon Sep 17 00:00:00 2001 From: Simon Wisselink Date: Fri, 22 Oct 2021 16:42:17 +0200 Subject: [PATCH] removed debug code --- make-release.sh | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/make-release.sh b/make-release.sh index e367cb127..b28f5437c 100755 --- a/make-release.sh +++ b/make-release.sh @@ -11,18 +11,16 @@ git checkout -b "release/$1" sed -i "s/=== Unreleased ===/=== Unreleased ===\\n\\n=== $1 - $(date +%Y-%m-%d) ===/" ChangeLog sed -i "s/var \$_version = '[^']\+';/var \$_version = '$1';/" libs/Smarty.class.php -exit; +git add ChangeLog libs/Smarty.class.php +git commit -m "version bump" -#git add ChangeLog libs/Smarty.class.php -#git commit -m "version bump" -# -#git checkout support/2.6 -#git pull -#git merge --no-ff "release/$1" -#git branch -d "release/$1" -#git tag -a "v$1" -m "Release $1" -# -#printf 'Done creating release %s\n' "$1" -# -## shellcheck disable=SC2016 -#printf 'Run `git push --follow-tags origin` to publish it.\n' \ No newline at end of file +git checkout support/2.6 +git pull +git merge --no-ff "release/$1" +git branch -d "release/$1" +git tag -a "v$1" -m "Release $1" + +printf 'Done creating release %s\n' "$1" + +# shellcheck disable=SC2016 +printf 'Run `git push --follow-tags origin` to publish it.\n' \ No newline at end of file