From 17a7d6fb5b8582a78edd743ac5579b6b80ac7ad7 Mon Sep 17 00:00:00 2001 From: Simon Wisselink Date: Thu, 14 Sep 2023 11:00:08 +0200 Subject: [PATCH] Fix release-script to user support-branch --- make-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make-release.sh b/make-release.sh index 6a652d51..e893deb3 100755 --- a/make-release.sh +++ b/make-release.sh @@ -14,7 +14,7 @@ sed -i "s/const SMARTY_VERSION = '[^']\+';/const SMARTY_VERSION = '$1';/" libs/S git add CHANGELOG.md libs/Smarty.class.php git commit -m "version bump" -git checkout master +git checkout support/4.3 git pull git merge --no-ff "release/$1" git branch -d "release/$1"