Merge pull request #10544 from marmelab/fix-release-tag-changelog

[chore] Fix release script does not include the changelog in the tag

scripts/release.sh

@@ -40,11 +40,22 @@ echo "Press Enter when this is done"
 read
 
 step "lerna version"
+# Running lerna version
+# This will create a commit and a tag
 ./node_modules/.bin/lerna version --force-publish --no-push
 
 # Get the version from package.json
 npm_package_version=$(jq -r '.version' ./packages/react-admin/package.json)
 
+# Remove the tag created by lerna
+echo "Removing tag v${npm_package_version} created by lerna"
+git tag -d "v${npm_package_version}"
+if [ ! -z "$RELEASE_DRY_RUN" ]; then
+    # In dry-run mode, reset the last commit to avoid accidental push
+    echo "dry mode -- Resetting the workspace to the last commit"
+    git reset --soft HEAD~1
+fi
+
 step "update-changelog"
 yarn run update-changelog ${npm_package_version}
 echo "Please review the ./CHANGELOG.md file and update it if needed."
@@ -56,6 +67,14 @@ if [ -z "$RELEASE_DRY_RUN" ]; then
     git commit -m "Update changelog for version ${npm_package_version}"
 fi
 
+step "git tag"
+if [ -z "$RELEASE_DRY_RUN" ]; then
+    echo "Creating new tag v${npm_package_version}"
+    git tag "v${npm_package_version}"
+else
+    echo "dry mode -- skipping git tag"
+fi
+
 step "git push"
 if [ -z "$RELEASE_DRY_RUN" ]; then
     echo "Pushing commits and tags to git"