v2.0.0-next.1

.changeset/git-cli-auth-header.md

@@ -1,5 +0,0 @@
----
-"@changesets/action": patch
----
-
-Authenticate git CLI pushes with the configured GitHub token using Git extra headers instead of writing to a global `.netrc` file.

.changeset/git-cli-server-url.md

@@ -1,5 +0,0 @@
----
-"@changesets/action": patch
----
-
-Derive the Git server URL from the GitHub Actions context when configuring git CLI authentication to support GitHub Enterprise Server setups.

.changeset/pre.json

@@ -8,8 +8,6 @@
     "all-cars-grin",
     "eight-clocks-pull",
     "eighty-doors-swim",
-    "git-cli-auth-header",
-    "git-cli-server-url",
     "lemon-turtles-itch",
     "ready-mangos-boil",
     "silent-tips-dance"

CHANGELOG.md

@@ -1,13 +1,5 @@
 # @changesets/action
 
-## 2.0.0-next.2
-
-### Patch Changes
-
-- [#670](https://github.com/changesets/action/pull/670) [`5a8b9b7`](https://github.com/changesets/action/commit/5a8b9b721bf683e3bf9bd72ea92a685dc024147b) Thanks [@Andarist](https://github.com/Andarist)! - Authenticate git CLI pushes with the configured GitHub token using Git extra headers instead of writing to a global `.netrc` file.
-
-- [#670](https://github.com/changesets/action/pull/670) [`5a8b9b7`](https://github.com/changesets/action/commit/5a8b9b721bf683e3bf9bd72ea92a685dc024147b) Thanks [@Andarist](https://github.com/Andarist)! - Derive the Git server URL from the GitHub Actions context when configuring git CLI authentication to support GitHub Enterprise Server setups.
-
 ## 2.0.0-next.1
 
 ### Patch Changes

dist/index.js

@@ -1,2 +1,2 @@
-import{_ as e,g as t,h as n,m as r,p as i,v as a}from"./get-packages.cjs-Dvdg-NAr.js";import{n as o,r as s,t as c}from"./run-Cekyj2rz.js";import{r as l,s as u}from"./utils-DQTbg3yF.js";import{t as d}from"./readChangesetState-D8jsqLyj.js";import f from"node:fs/promises";(async()=>{let p=process.env.GITHUB_TOKEN||n(`github-token`);if(!p){e(`Please add the GITHUB_TOKEN to the changesets action`);return}let m=process.cwd(),h=u(`commitMode`)??`git-cli`,g=u(`prDraft`);if(h!==`git-cli`&&h!==`github-api`){e(`Invalid commit mode: ${h}`);return}if(g!==void 0&&g!==`always`&&g!==`create`){e(`Invalid prDraft: ${g}`);return}let _=new s({cwd:m,githubToken:p,commitMode:h});r(`setupGitUser`)&&(t(`setting git user`),await _.setupUser());let{changesets:v}=await d(m),y=n(`publish`),b=v.length!==0,x=v.some(e=>e.releases.length>0),S=!!y;switch(a(`published`,`false`),a(`publishedPackages`,`[]`),a(`hasChangesets`,String(b)),!0){case!b&&!S:t(`No changesets present or were removed by merging release PR. Not publishing because no publish script found.`);return;case!b&&S:{if(t(`No changesets found. Attempting to publish any unpublished packages to npm`),process.env.NPM_TOKEN){let e=`${process.env.HOME}/.npmrc`;await l(e)?(t(`Found existing user .npmrc file`),(await f.readFile(e,`utf8`)).split(`
+import{_ as e,g as t,h as n,m as r,p as i,v as a}from"./get-packages.cjs-Dvdg-NAr.js";import{i as o,n as s,r as c,t as l}from"./run-CRWwTmP3.js";import{r as u,s as d}from"./utils-DQTbg3yF.js";import{t as f}from"./readChangesetState-D8jsqLyj.js";import p from"node:fs/promises";(async()=>{let m=process.env.GITHUB_TOKEN||n(`github-token`);if(!m){e(`Please add the GITHUB_TOKEN to the changesets action`);return}let h=process.cwd(),g=c(m),_=d(`commitMode`)??`git-cli`,v=d(`prDraft`);if(_!==`git-cli`&&_!==`github-api`){e(`Invalid commit mode: ${_}`);return}if(v!==void 0&&v!==`always`&&v!==`create`){e(`Invalid prDraft: ${v}`);return}let y=new o({octokit:_===`github-api`?g:void 0,cwd:h});r(`setupGitUser`)&&(t(`setting git user`),await y.setupUser()),t(`setting GitHub credentials`),await p.writeFile(`${process.env.HOME}/.netrc`,`machine github.com\nlogin github-actions[bot]\npassword ${m}`);let{changesets:b}=await f(h),x=n(`publish`),S=b.length!==0,C=b.some(e=>e.releases.length>0),w=!!x;switch(a(`published`,`false`),a(`publishedPackages`,`[]`),a(`hasChangesets`,String(S)),!0){case!S&&!w:t(`No changesets present or were removed by merging release PR. Not publishing because no publish script found.`);return;case!S&&w:{if(t(`No changesets found. Attempting to publish any unpublished packages to npm`),process.env.NPM_TOKEN){let e=`${process.env.HOME}/.npmrc`;await u(e)?(t(`Found existing user .npmrc file`),(await p.readFile(e,`utf8`)).split(`
-`).find(e=>/^\s*\/\/registry\.npmjs\.org\/:[_-]authToken=/i.test(e))?t(`Found existing auth token for the npm registry in the user .npmrc file`):(t(`Didn't find existing auth token for the npm registry in the user .npmrc file, creating one`),await f.appendFile(e,`\n//registry.npmjs.org/:_authToken=${process.env.NPM_TOKEN}\n`))):(t(`No user .npmrc file found, creating one with NPM_TOKEN used as auth token`),await f.writeFile(e,`//registry.npmjs.org/:_authToken=${process.env.NPM_TOKEN}\n`))}else process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN&&process.env.ACTIONS_ID_TOKEN_REQUEST_URL?t(`No NPM_TOKEN found, but OIDC is available - using npm trusted publishing`):t(`No NPM_TOKEN or OIDC available - assuming npm is already authenticated`);let e=await c({script:y,github:_,createGithubReleases:r(`createGithubReleases`),cwd:m});e.published&&(a(`published`,`true`),a(`publishedPackages`,JSON.stringify(e.publishedPackages))),e.exitCode!==0&&(i(`Publish command exited with code ${e.exitCode}${e.published?`, but some packages were published: ${e.publishedPackages.map(e=>`${e.name}@${e.version}`).join(`, `)}`:``}`),process.exit(e.exitCode));return}case b&&!x:t(`All changesets are empty; not creating PR`);return;case b:{let{pullRequestNumber:e}=await o({script:u(`version`),github:_,cwd:m,prTitle:u(`title`),commitMessage:u(`commit`),hasPublishScript:S,prDraft:g,branch:u(`branch`)});a(`pullRequestNumber`,String(e));return}}})().catch(t=>{i(t),e(t.message)});export{};
+`).find(e=>/^\s*\/\/registry\.npmjs\.org\/:[_-]authToken=/i.test(e))?t(`Found existing auth token for the npm registry in the user .npmrc file`):(t(`Didn't find existing auth token for the npm registry in the user .npmrc file, creating one`),await p.appendFile(e,`\n//registry.npmjs.org/:_authToken=${process.env.NPM_TOKEN}\n`))):(t(`No user .npmrc file found, creating one with NPM_TOKEN used as auth token`),await p.writeFile(e,`//registry.npmjs.org/:_authToken=${process.env.NPM_TOKEN}\n`))}else process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN&&process.env.ACTIONS_ID_TOKEN_REQUEST_URL?t(`No NPM_TOKEN found, but OIDC is available - using npm trusted publishing`):t(`No NPM_TOKEN or OIDC available - assuming npm is already authenticated`);let e=await l({script:x,githubToken:m,git:y,octokit:g,createGithubReleases:r(`createGithubReleases`),cwd:h});e.published&&(a(`published`,`true`),a(`publishedPackages`,JSON.stringify(e.publishedPackages))),e.exitCode!==0&&(i(`Publish command exited with code ${e.exitCode}${e.published?`, but some packages were published: ${e.publishedPackages.map(e=>`${e.name}@${e.version}`).join(`, `)}`:``}`),process.exit(e.exitCode));return}case S&&!C:t(`All changesets are empty; not creating PR`);return;case S:{let e=c(m),{pullRequestNumber:t}=await s({script:d(`version`),githubToken:m,git:y,octokit:e,cwd:h,prTitle:d(`title`),commitMessage:d(`commit`),hasPublishScript:w,prDraft:v,branch:d(`branch`)});a(`pullRequestNumber`,String(t));return}}})().catch(t=>{i(t),e(t.message)});export{};

dist/publish.js

@@ -1 +1 @@
-import{_ as e,m as t,v as n}from"./get-packages.cjs-Dvdg-NAr.js";import{r,t as i}from"./run-Cekyj2rz.js";import{c as a,s as o,t as s}from"./utils-DQTbg3yF.js";import c from"node:fs/promises";import l from"node:os";try{await u()}catch(t){e(t.message)}async function u(){let e=a(`github-token`),u=o(`script`),d=o(`pack-dir-artifact-id`),f=t(`create-github-releases`),p=process.cwd(),m=await i({script:u,github:new r({cwd:p,githubToken:e,commitMode:`github-api`}),createGithubReleases:f,cwd:p,fromPackDir:d?await s(process.env.RUNNER_TEMP??await c.realpath(l.tmpdir()),Number(d),`changeset-pack`):void 0});if(m.published?(n(`published`,`true`),n(`published-packages`,JSON.stringify(m.publishedPackages))):n(`published`,`false`),m.exitCode!==0)throw Error(`Publish command exited with code ${m.exitCode}${m.published?`, but some packages were published: ${m.publishedPackages.map(e=>`${e.name}@${e.version}`).join(`, `)}`:``}`)}export{};
+import{_ as e,m as t,v as n}from"./get-packages.cjs-Dvdg-NAr.js";import{i as r,r as i,t as a}from"./run-CRWwTmP3.js";import{c as o,s,t as c}from"./utils-DQTbg3yF.js";import l from"node:fs/promises";import u from"node:os";try{await d()}catch(t){e(t.message)}async function d(){let e=o(`github-token`),d=s(`script`),f=s(`pack-dir-artifact-id`),p=t(`create-github-releases`),m=process.cwd(),h=i(e),g=await a({script:d,githubToken:e,git:new r({octokit:h,cwd:m}),octokit:h,createGithubReleases:p,cwd:m,fromPackDir:f?await c(process.env.RUNNER_TEMP??await l.realpath(u.tmpdir()),Number(f),`changeset-pack`):void 0});if(g.published?(n(`published`,`true`),n(`published-packages`,JSON.stringify(g.publishedPackages))):n(`published`,`false`),g.exitCode!==0)throw Error(`Publish command exited with code ${g.exitCode}${g.published?`, but some packages were published: ${g.publishedPackages.map(e=>`${e.name}@${e.version}`).join(`, `)}`:``}`)}export{};

dist/version.js

@@ -1 +1 @@
-import{_ as e,g as t,m as n,v as r}from"./get-packages.cjs-Dvdg-NAr.js";import{n as i,r as a}from"./run-Cekyj2rz.js";import{c as o,s}from"./utils-DQTbg3yF.js";try{await c()}catch(t){e(t.message)}async function c(){let e=o(`github-token`),c=s(`script`),l=o(`commit-message`),u=o(`pr-title`),d=s(`pr-draft`),f=s(`pr-base-branch`),p=s(`commit-mode`)??`git-cli`,m=n(`setup-git-user`);if(d!==void 0&&d!==`always`&&d!==`create`)throw Error(`Invalid pr-draft input: ${d}`);if(p!==`git-cli`&&p!==`github-api`)throw Error(`Invalid commit-mode input: ${p}`);let h=process.cwd(),g=new a({cwd:h,githubToken:e,commitMode:p});m&&(t(`setting git user`),await g.setupUser());let{pullRequestNumber:_}=await i({script:c,github:g,cwd:h,prTitle:u,commitMessage:l,hasPublishScript:!0,prDraft:d,branch:f});r(`pr-number`,String(_))}export{};
+import{_ as e,g as t,m as n,v as r}from"./get-packages.cjs-Dvdg-NAr.js";import{i,n as a,r as o}from"./run-CRWwTmP3.js";import{c as s,s as c}from"./utils-DQTbg3yF.js";try{await l()}catch(t){e(t.message)}async function l(){let e=s(`github-token`),l=c(`script`),u=s(`commit-message`),d=s(`pr-title`),f=c(`pr-draft`),p=c(`pr-base-branch`),m=c(`commit-mode`)??`git-cli`,h=n(`setup-git-user`);if(f!==void 0&&f!==`always`&&f!==`create`)throw Error(`Invalid pr-draft input: ${f}`);let g=process.cwd(),_=o(e),v=new i({octokit:m===`github-api`?_:void 0,cwd:g});h&&(t(`setting git user`),await v.setupUser());let{pullRequestNumber:y}=await a({script:l,githubToken:e,git:v,octokit:_,cwd:g,prTitle:d,commitMessage:u,hasPublishScript:!0,prDraft:f,branch:p});r(`pr-number`,String(y))}export{};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@changesets/action",
-  "version": "2.0.0-next.2",
+  "version": "2.0.0-next.1",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",

src/git.ts

@@ -1,15 +1,11 @@
-import { Buffer } from "node:buffer";
 import * as core from "@actions/core";
 import { exec, getExecOutput } from "@actions/exec";
-import { context } from "@actions/github";
+import * as github from "@actions/github";
 import { commitChangesFromRepo } from "@changesets/ghcommit/git";
-import { setupOctokit, type Octokit } from "./octokit.ts";
+import type { Octokit } from "./octokit.ts";
-
-export type CommitMode = "git-cli" | "github-api";
 
 type GitOptions = {
   cwd: string;
-  env?: Record<string, string>;
 };
 
 const push = async (branch: string, options: GitOptions) => {
@@ -50,51 +46,17 @@ const checkIfClean = async (options: GitOptions): Promise<boolean> => {
   return !stdout.length;
 };
 
-export class GitHub {
+export class Git {
-  readonly #githubToken: string;
+  readonly octokit: Octokit | null;
-  readonly octokit: Octokit;
   readonly cwd: string;
-  readonly commitMode: CommitMode;
 
-  constructor(options: {
+  constructor(args: { octokit?: Octokit; cwd: string }) {
-    githubToken: string;
+    this.octokit = args.octokit ?? null;
-    cwd: string;
+    this.cwd = args.cwd;
-    commitMode?: CommitMode;
-  }) {
-    this.#githubToken = options.githubToken;
-    this.cwd = options.cwd;
-    this.commitMode = options.commitMode ?? "git-cli";
-    this.octokit = setupOctokit(options.githubToken);
-  }
-
-  getToken() {
-    return this.#githubToken;
-  }
-
-  #getCliAuthEnv(): Record<string, string> {
-    const basic = Buffer.from(`x-access-token:${this.#githubToken}`).toString(
-      "base64",
-    );
-    const serverUrl = (
-      context.serverUrl ??
-      process.env.GITHUB_SERVER_URL ??
-      "https://github.com"
-    ).replace(/\/+$/, "");
-    const gitConfigCount = Number(process.env.GIT_CONFIG_COUNT ?? 0);
-    if (!Number.isInteger(gitConfigCount) || gitConfigCount < 0) {
-      throw new Error(
-        `Invalid GIT_CONFIG_COUNT value: ${process.env.GIT_CONFIG_COUNT}`,
-      );
-    }
-    return {
-      GIT_CONFIG_COUNT: String(gitConfigCount + 1),
-      [`GIT_CONFIG_KEY_${gitConfigCount}`]: `http.${serverUrl}/.extraheader`,
-      [`GIT_CONFIG_VALUE_${gitConfigCount}`]: `AUTHORIZATION: basic ${basic}`,
-    };
   }
 
   async setupUser() {
-    if (this.commitMode === "github-api") {
+    if (this.octokit) {
       return;
     }
     await exec("git", ["config", "user.name", `"github-actions[bot]"`], {
@@ -114,38 +76,32 @@ export class GitHub {
   }
 
   async pushTag(tag: string) {
-    if (this.commitMode === "github-api") {
+    if (this.octokit) {
       return this.octokit.rest.git
         .createRef({
-          ...context.repo,
+          ...github.context.repo,
           ref: `refs/tags/${tag}`,
-          sha: context.sha,
+          sha: github.context.sha,
         })
         .catch((err) => {
           // Assuming tag was manually pushed in custom publish script
           core.warning(`Failed to create tag ${tag}: ${err.message}`);
         });
     }
-    await exec("git", ["push", "origin", tag], {
+    await exec("git", ["push", "origin", tag], { cwd: this.cwd });
-      cwd: this.cwd,
-      env: {
-        ...process.env,
-        ...this.#getCliAuthEnv(),
-      } as Record<string, string>,
-    });
   }
 
   async prepareBranch(branch: string) {
-    if (this.commitMode === "github-api") {
+    if (this.octokit) {
       // Preparing a new local branch is not necessary when using the API
       return;
     }
     await switchToMaybeExistingBranch(branch, { cwd: this.cwd });
-    await reset(context.sha, { cwd: this.cwd });
+    await reset(github.context.sha, { cwd: this.cwd });
   }
 
   async pushChanges({ branch, message }: { branch: string; message: string }) {
-    if (this.commitMode === "github-api") {
+    if (this.octokit) {
       /**
        * Only add files form the current working directory
        *
@@ -155,11 +111,11 @@ export class GitHub {
       const addFromDirectory = this.cwd;
       return commitChangesFromRepo({
         octokit: this.octokit,
-        ...context.repo,
+        ...github.context.repo,
         branch,
         message,
         base: {
-          commit: context.sha,
+          commit: github.context.sha,
         },
         cwd: this.cwd,
         force: true,
@@ -168,12 +124,6 @@ export class GitHub {
     if (!(await checkIfClean({ cwd: this.cwd }))) {
       await commitAll(message, { cwd: this.cwd });
     }
-    await push(branch, {
+    await push(branch, { cwd: this.cwd });
-      cwd: this.cwd,
-      env: {
-        ...process.env,
-        ...this.#getCliAuthEnv(),
-      } as Record<string, string>,
-    });
   }
 }

src/index.ts

@@ -1,6 +1,7 @@
 import fs from "node:fs/promises";
 import * as core from "@actions/core";
-import { GitHub } from "./github.ts";
+import { Git } from "./git.ts";
+import { setupOctokit } from "./octokit.ts";
 import readChangesetState from "./readChangesetState.ts";
 import { runPublish, runVersion } from "./run.ts";
 import { fileExists, getOptionalInput } from "./utils.ts";
@@ -18,6 +19,7 @@ import { fileExists, getOptionalInput } from "./utils.ts";
   // If the user needs to change the cwd, set `working-directory` in the step instead
   const cwd = process.cwd();
 
+  const octokit = setupOctokit(githubToken);
   const commitMode = getOptionalInput("commitMode") ?? "git-cli";
   const prDraft = getOptionalInput("prDraft");
   if (commitMode !== "git-cli" && commitMode !== "github-api") {
@@ -28,19 +30,24 @@ import { fileExists, getOptionalInput } from "./utils.ts";
     core.setFailed(`Invalid prDraft: ${prDraft}`);
     return;
   }
-  const github = new GitHub({
+  const git = new Git({
+    octokit: commitMode === "github-api" ? octokit : undefined,
     cwd,
-    githubToken,
-    commitMode,
   });
 
   let setupGitUser = core.getBooleanInput("setupGitUser");
 
   if (setupGitUser) {
     core.info("setting git user");
-    await github.setupUser();
+    await git.setupUser();
   }
 
+  core.info("setting GitHub credentials");
+  await fs.writeFile(
+    `${process.env.HOME}/.netrc`,
+    `machine github.com\nlogin github-actions[bot]\npassword ${githubToken}`,
+  );
+
   let { changesets } = await readChangesetState(cwd);
 
   let publishScript = core.getInput("publish");
@@ -112,7 +119,9 @@ import { fileExists, getOptionalInput } from "./utils.ts";
 
       const result = await runPublish({
         script: publishScript,
-        github,
+        githubToken,
+        git,
+        octokit,
         createGithubReleases: core.getBooleanInput("createGithubReleases"),
         cwd,
       });
@@ -143,9 +152,12 @@ import { fileExists, getOptionalInput } from "./utils.ts";
       core.info("All changesets are empty; not creating PR");
       return;
     case hasChangesets: {
+      const octokit = setupOctokit(githubToken);
       const { pullRequestNumber } = await runVersion({
         script: getOptionalInput("version"),
-        github,
+        githubToken,
+        git,
+        octokit,
         cwd,
         prTitle: getOptionalInput("title"),
         commitMessage: getOptionalInput("commit"),

src/publish/index.ts

@@ -1,7 +1,8 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import * as core from "@actions/core";
-import { GitHub } from "../github.ts";
+import { Git } from "../git.ts";
+import { setupOctokit } from "../octokit.ts";
 import { runPublish } from "../run.ts";
 import {
   downloadArtifact,
@@ -24,8 +25,9 @@ async function main() {
   // If the user needs to change the cwd, set `working-directory` in the step instead
   const cwd = process.cwd();
 
-  // NOTE: Always use API mode here as publish does not need a commit-mode.
+  const octokit = setupOctokit(githubToken);
-  const github = new GitHub({ cwd, githubToken, commitMode: "github-api" });
+  // NOTE: Always pass octokit here as publish does not need a commit-mode
+  const git = new Git({ octokit, cwd });
 
   const fromPackDir = packDirArtifactId
     ? await downloadArtifact(
@@ -37,7 +39,9 @@ async function main() {
 
   const result = await runPublish({
     script,
-    github,
+    githubToken,
+    git,
+    octokit,
     createGithubReleases,
     cwd,
     fromPackDir,

src/run.test.ts

@@ -3,7 +3,8 @@ import type { Changeset } from "@changesets/types";
 import writeChangeset from "@changesets/write";
 import { createFixture } from "fs-fixture";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { GitHub } from "./github.ts";
+import { Git } from "./git.ts";
+import { setupOctokit } from "./octokit.ts";
 import { runVersion } from "./run.ts";
 
 vi.mock("@actions/github", () => ({
@@ -20,6 +21,7 @@ vi.mock("@actions/github", () => ({
     graphql: mockedGraphql,
   }),
 }));
+vi.mock("./git.ts");
 vi.mock("@changesets/ghcommit/git");
 
 let mockedGithubMethods = {
@@ -89,13 +91,6 @@ const writeChangesets = (changesets: Changeset[], cwd: string) => {
   return Promise.all(changesets.map((commit) => writeChangeset(commit, cwd)));
 };
 
-const createGithub = (cwd: string) =>
-  new GitHub({
-    cwd,
-    githubToken: "@@GITHUB_TOKEN",
-    commitMode: "github-api",
-  });
-
 beforeEach(() => {
   vi.clearAllMocks();
 });
@@ -131,7 +126,9 @@ describe("version", () => {
     );
 
     await runVersion({
-      github: createGithub(cwd),
+      octokit: setupOctokit("@@GITHUB_TOKEN"),
+      githubToken: "@@GITHUB_TOKEN",
+      git: new Git({ cwd }),
       cwd,
     });
 
@@ -164,7 +161,9 @@ describe("version", () => {
     );
 
     await runVersion({
-      github: createGithub(cwd),
+      octokit: setupOctokit("@@GITHUB_TOKEN"),
+      githubToken: "@@GITHUB_TOKEN",
+      git: new Git({ cwd }),
       cwd,
       prDraft: "create",
     });
@@ -198,7 +197,9 @@ describe("version", () => {
     );
 
     await runVersion({
-      github: createGithub(cwd),
+      octokit: setupOctokit("@@GITHUB_TOKEN"),
+      githubToken: "@@GITHUB_TOKEN",
+      git: new Git({ cwd }),
       cwd,
     });
 
@@ -231,7 +232,9 @@ describe("version", () => {
     );
 
     await runVersion({
-      github: createGithub(cwd),
+      octokit: setupOctokit("@@GITHUB_TOKEN"),
+      githubToken: "@@GITHUB_TOKEN",
+      git: new Git({ cwd }),
       cwd,
     });
 
@@ -284,7 +287,9 @@ fluminis divesque vulnere aquis parce lapsis rabie si visa fulmineis.
     );
 
     await runVersion({
-      github: createGithub(cwd),
+      octokit: setupOctokit("@@GITHUB_TOKEN"),
+      githubToken: "@@GITHUB_TOKEN",
+      git: new Git({ cwd }),
       cwd,
       prBodyMaxCharacters: 1000,
     });
@@ -341,7 +346,9 @@ fluminis divesque vulnere aquis parce lapsis rabie si visa fulmineis.
     );
 
     await runVersion({
-      github: createGithub(cwd),
+      octokit: setupOctokit("@@GITHUB_TOKEN"),
+      githubToken: "@@GITHUB_TOKEN",
+      git: new Git({ cwd }),
       cwd,
       prBodyMaxCharacters: 500,
     });
@@ -376,7 +383,9 @@ fluminis divesque vulnere aquis parce lapsis rabie si visa fulmineis.
     );
 
     await runVersion({
-      github: createGithub(cwd),
+      octokit: setupOctokit("@@GITHUB_TOKEN"),
+      githubToken: "@@GITHUB_TOKEN",
+      git: new Git({ cwd }),
       cwd,
       prDraft: "create",
     });
@@ -408,7 +417,9 @@ fluminis divesque vulnere aquis parce lapsis rabie si visa fulmineis.
     );
 
     await runVersion({
-      github: createGithub(cwd),
+      octokit: setupOctokit("@@GITHUB_TOKEN"),
+      githubToken: "@@GITHUB_TOKEN",
+      git: new Git({ cwd }),
       cwd,
       prDraft: "always",
     });

src/run.ts

@@ -7,10 +7,10 @@ import {
   type ExecOptions,
   type ExecOutput,
 } from "@actions/exec";
-import { context } from "@actions/github";
+import * as github from "@actions/github";
 import type { PreState } from "@changesets/types";
 import { type Package, getPackages } from "@manypkg/get-packages";
-import type { GitHub } from "./github.ts";
+import { Git } from "./git.ts";
 import type { Octokit } from "./octokit.ts";
 import readChangesetState from "./readChangesetState.ts";
 import {
@@ -57,15 +57,17 @@ const createRelease = async (
     tag_name: tagName,
     body: changelogEntry.content,
     prerelease: pkg.packageJson.version.includes("-"),
-    ...context.repo,
+    ...github.context.repo,
   });
 };
 
 type PublishOptions = {
   script?: string;
   fromPackDir?: string;
+  githubToken: string;
+  octokit: Octokit;
   createGithubReleases: boolean;
-  github: GitHub;
+  git: Git;
   cwd: string;
 };
 
@@ -85,16 +87,17 @@ type PublishResult =
 export async function runPublish({
   script,
   fromPackDir,
-  github,
+  githubToken,
+  git,
+  octokit,
   createGithubReleases,
   cwd,
 }: PublishOptions): Promise<PublishResult> {
-  const { octokit } = github;
   let changesetPublishOutput: ExecOutput;
   const execOptions: ExecOptions = {
     cwd,
     ignoreReturnCode: true,
-    env: { ...process.env, GITHUB_TOKEN: github.getToken() },
+    env: { ...process.env, GITHUB_TOKEN: githubToken },
   };
 
   if (script) {
@@ -141,7 +144,7 @@ export async function runPublish({
       await Promise.all(
         releasedPackages.map(async (pkg) => {
           const tagName = `${pkg.packageJson.name}@${pkg.packageJson.version}`;
-          await github.pushTag(tagName);
+          await git.pushTag(tagName);
           await createRelease(octokit, { pkg, tagName });
         }),
       );
@@ -163,7 +166,7 @@ export async function runPublish({
         releasedPackages.push(pkg);
         if (createGithubReleases) {
           const tagName = `v${pkg.packageJson.version}`;
-          await github.pushTag(tagName);
+          await git.pushTag(tagName);
           await createRelease(octokit, { pkg, tagName });
         }
         break;
@@ -256,7 +259,9 @@ export async function getVersionPrBody({
 
 type VersionOptions = {
   script?: string;
-  github: GitHub;
+  githubToken: string;
+  git: Git;
+  octokit: Octokit;
   cwd?: string;
   prTitle?: string;
   commitMessage?: string;
@@ -272,25 +277,26 @@ type RunVersionResult = {
 
 export async function runVersion({
   script,
-  github,
+  githubToken,
+  git,
+  octokit,
   cwd = process.cwd(),
   prTitle = "Version Packages",
   commitMessage = "Version Packages",
   hasPublishScript = false,
   prBodyMaxCharacters = MAX_CHARACTERS_PER_MESSAGE,
-  branch = context.ref.replace("refs/heads/", ""),
+  branch = github.context.ref.replace("refs/heads/", ""),
   prDraft,
 }: VersionOptions): Promise<RunVersionResult> {
-  const { octokit } = github;
   let versionBranch = `changeset-release/${branch}`;
 
   let { preState } = await readChangesetState(cwd);
 
-  await github.prepareBranch(versionBranch);
+  await git.prepareBranch(versionBranch);
 
   let versionsByDirectory = await getVersionsByDirectory(cwd);
 
-  const env = { ...process.env, GITHUB_TOKEN: github.getToken() };
+  const env = { ...process.env, GITHUB_TOKEN: githubToken };
 
   if (script) {
     await exec(script, undefined, { cwd, env });
@@ -329,9 +335,9 @@ export async function runVersion({
    * which GitHub will then react to by closing the PRs)
    */
   const existingPullRequests = await octokit.rest.pulls.list({
-    ...context.repo,
+    ...github.context.repo,
     state: "open",
-    head: `${context.repo.owner}:${versionBranch}`,
+    head: `${github.context.repo.owner}:${versionBranch}`,
     base: branch,
   });
   core.info(
@@ -342,10 +348,7 @@ export async function runVersion({
     )}`,
   );
 
-  await github.pushChanges({
+  await git.pushChanges({ branch: versionBranch, message: finalCommitMessage });
-    branch: versionBranch,
-    message: finalCommitMessage,
-  });
 
   const changedPackagesInfo = (await changedPackagesInfoPromises)
     .filter((x) => x)
@@ -367,7 +370,7 @@ export async function runVersion({
       title: finalPrTitle,
       body: prBody,
       draft: prDraft !== undefined,
-      ...context.repo,
+      ...github.context.repo,
     });
 
     return {

src/version/index.ts

@@ -1,5 +1,6 @@
 import * as core from "@actions/core";
-import { GitHub } from "../github.ts";
+import { Git } from "../git.ts";
+import { setupOctokit } from "../octokit.ts";
 import { runVersion } from "../run.ts";
 import { getOptionalInput, getRequiredInput } from "../utils.ts";
 
@@ -23,27 +24,26 @@ async function main() {
   if (prDraft !== undefined && prDraft !== "always" && prDraft !== "create") {
     throw new Error(`Invalid pr-draft input: ${prDraft}`);
   }
-  if (commitMode !== "git-cli" && commitMode !== "github-api") {
-    throw new Error(`Invalid commit-mode input: ${commitMode}`);
-  }
 
   // If the user needs to change the cwd, set `working-directory` in the step instead
   const cwd = process.cwd();
 
-  const github = new GitHub({
+  const octokit = setupOctokit(githubToken);
+  const git = new Git({
+    octokit: commitMode === "github-api" ? octokit : undefined,
     cwd,
-    githubToken,
-    commitMode,
   });
 
   if (setupGitUser) {
     core.info("setting git user");
-    await github.setupUser();
+    await git.setupUser();
   }
 
   const { pullRequestNumber } = await runVersion({
     script,
-    github,
+    githubToken,
+    git,
+    octokit,
     cwd,
     prTitle,
     commitMessage,