pick: fix tag creation

sampaiodiego · Jul 6, 2023 · ffb049f · ffb049f
1 parent 9320f49
commit ffb049f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.changeset/gentle-tigers-lay.md b/.changeset/gentle-tigers-lay.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/release-action': minor
+---
+
+fix tag
diff --git a/packages/release-action/src/publishRelease.ts b/packages/release-action/src/publishRelease.ts
@@ -81,14 +81,15 @@ export async function publishRelease({
 
 	// merge release changes to master
 	await exec('git', ['checkout', 'master']);
-	await exec('git', ['merge', '--no-ff', '--no-edit', branchName.trim()]);
+	await exec('git', ['merge', '--no-edit', branchName.trim()]);
 
 	core.info('fix dependencies in workspace packages');
 	await fixWorkspaceVersionsBeforePublish();
 
 	await exec('yarn', ['changeset', 'publish', '--no-git-tag']);
 
-	await exec('git', ['tag', newVersion]);
+	// create an annotated tag so git push --follow-tags will push the tag
+	await exec('git', ['tag', newVersion, '-m', newVersion]);
 
 	await exec('git', ['push', '--follow-tags']);
 
@@ -97,7 +98,6 @@ export async function publishRelease({
 		name: newVersion,
 		tag_name: newVersion,
 		body: releaseBody,
-		draft: true,
 		prerelease: newVersion.includes('-'),
 		...github.context.repo,
 	});