Merge branch 'release/v1.2.20'

README.txt

@@ -3,8 +3,8 @@ Contributors: MB-Jan, wink
 Tags: travel, wink, booking
 Requires at least: 4.7
 Tested up to: 6.2.2
-Stable tag: 1.2.19
-Version: 1.2.19
+Stable tag: 1.2.20
+Version: 1.2.20
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -53,6 +53,9 @@ No. It is not yet compatible with PHP 8.x
 
 == Changelog ==
 
+= 1.2.20 =
+* Updated release script.
+
 = 1.2.19 =
 * Updated readme and tested with latest version of WordPress.
 

releaseToMaster.bash

@@ -35,6 +35,15 @@ git flow release finish -m $versionNumber $versionNumber
 echo "Checking out master..."
 git checkout master
 
+echo "Updating CHANGELOG.md..."
+npx git-changelog-command-line -of CHANGELOG.md
+git commit -a -m ":memo: doc: Updated CHANGELOG.md..."
+
+git push origin master:refs/heads/master
+
+echo "Creating GitHub release..."
+gh release create v$newVersion --notes "See CHANGELOG.md for release notes" --target master
+
 echo "Pulling ORIGIN master into local branch..."
 git pull origin
 
@@ -48,6 +57,9 @@ git checkout develop
 echo "Pulling ORIGIN develop into local branch..."
 git pull origin
 
+echo "Merging CHANGELOG.md from master into develop..."
+git merge master --no-edit -m ":twisted_rightwards_arrows: doc: merged CHANGELOG.md from master into develop branch" --strategy-option theirs
+
 echo "Pushing develop to ORIGIN..."
 git push