Merge branch 'main' into feature/configurable-pr-body

Author: furcan

.changeset/sunny-moons-appear.md

@@ -1,5 +1,17 @@
 # @changesets/action
 
+## 2.1.2
+
+### Patch Changes
+
+- [#735](https://github.com/changesets/action/pull/735) [`8833883`](https://github.com/changesets/action/commit/88338839e35c3e0fa61f3c9c3f27e7572cd5f2cf) Thanks [@bluwy](https://github.com/bluwy)! - Handle error when pushing git tags with the git CLI
+
+- [#724](https://github.com/changesets/action/pull/724) [`36f529f`](https://github.com/changesets/action/commit/36f529f13ab58bbcf6331035cb950385586e8a89) Thanks [@bluwy](https://github.com/bluwy)! - Improve log messages
+
+- [#724](https://github.com/changesets/action/pull/724) [`36f529f`](https://github.com/changesets/action/commit/36f529f13ab58bbcf6331035cb950385586e8a89) Thanks [@bluwy](https://github.com/bluwy)! - Fix root action double error logs
+
+- [#729](https://github.com/changesets/action/pull/729) [`ca85897`](https://github.com/changesets/action/commit/ca8589735af2ff6977a0f6474537d550040530d8) Thanks [@bluwy](https://github.com/bluwy)! - Always switch and reset branch when generating version commits, similar to if `push-with-git-cli` is enabled
+
 ## 2.1.1
 
 ### Patch Changes

.changeset/warm-teeth-listen.md

@@ -1,6 +1,6 @@
 {
   "name": "@changesets/action",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "private": true,
   "license": "MIT",
   "type": "module",

CHANGELOG.md

@@ -195,7 +195,7 @@ export class GitHub {
     if (authorIdentity.exitCode === 0 && committerIdentity.exitCode === 0) {
       return;
     }
-    core.info("Setting Git user to github-actions[bot]");
+    core.info("Setting git user to github-actions[bot]");
     await exec("git", ["config", "user.name", `"github-actions[bot]"`], {
       cwd: this.cwd,
     });
@@ -213,25 +213,27 @@ export class GitHub {
   }
 
   async pushTag(tag: string) {
-    if (!this.pushWithGitCli) {
-      return this.octokit.rest.git
-        .createRef({
+    try {
+      if (!this.pushWithGitCli) {
+        await this.octokit.rest.git.createRef({
           ...context.repo,
           ref: `refs/tags/${tag}`,
           sha: context.sha,
-        })
-        .catch((err) => {
-          // Assuming tag was manually pushed in custom publish script
-          core.warning(`Failed to create tag ${tag}: ${err.message}`);
         });
+      } else {
+        await exec("git", ["push", "origin", tag], {
+          cwd: this.cwd,
+          env: {
+            ...process.env,
+            ...(await this.#getCliAuthEnv()),
+          } as Record<string, string>,
+        });
+      }
+    } catch (err) {
+      core.warning(
+        `Failed to create git tag "${tag}". Assuming it was manually pushed by the publish script: ${(err as Error).message}`,
+      );
     }
-    await exec("git", ["push", "origin", tag], {
-      cwd: this.cwd,
-      env: {
-        ...process.env,
-        ...(await this.#getCliAuthEnv()),
-      } as Record<string, string>,
-    });
   }
 
   async prepareBranch(branch: string) {

package.json

@@ -68,7 +68,7 @@ async function main() {
   switch (true) {
     case !hasChangesets && !hasPublishScript:
       core.info(
-        "No changesets present or were removed by merging release PR. Not publishing because no publish script found.",
+        "No changesets present or were removed by merging version PR. Not publishing because publish-script is not set.",
       );
       return;
     case !hasChangesets && hasPublishScript: {
@@ -104,7 +104,7 @@ async function main() {
       }
 
       if (result.exitCode !== 0) {
-        core.error(
+        throw new Error(
           `Publish command exited with code ${result.exitCode}${
             result.published
               ? `, but some packages were published: ${result.publishedPackages
@@ -113,12 +113,11 @@ async function main() {
               : ""
           }`,
         );
-        process.exit(result.exitCode);
       }
       return;
     }
     case hasChangesets && !hasNonEmptyChangesets:
-      core.info("All changesets are empty; not creating PR");
+      core.info("All changesets are empty. Not creating PR");
       return;
     case hasChangesets: {
       const { pullRequestNumber } = await runVersion({

src/github.ts

@@ -391,7 +391,7 @@ export async function runVersion({
     head: `${context.repo.owner}:${versionBranch}`,
     base: branch,
   });
-  core.info(
+  core.debug(
     `Existing pull requests: ${JSON.stringify(
       existingPullRequests.data,
       null,
@@ -418,7 +418,7 @@ export async function runVersion({
   });
 
   if (existingPullRequests.data.length === 0) {
-    core.info("creating pull request");
+    core.info("Creating pull request");
     const { data: newPullRequest } = await octokit.rest.pulls.create({
       base: branch,
       head: versionBranch,
@@ -434,7 +434,7 @@ export async function runVersion({
   } else {
     const [pullRequest] = existingPullRequests.data;
 
-    core.info(`updating found pull request #${pullRequest.number}`);
+    core.info(`Updating found pull request #${pullRequest.number}`);
     const convertPullRequestToDraftMutation =
       prDraft === "always"
         ? `