Upgrade @actions/* dependencies (#123)

Andarist · web-flow · commit b78f48099899 · 2022-11-08T10:26:23.000+01:00
* Upgrade `@actions/*` dependencies

* bumps deps again

* add changeset
diff --git a/.changeset/big-scissors-pay.md b/.changeset/big-scissors-pay.md
@@ -0,0 +1,5 @@
+---
+"@changesets/action": patch
+---
+
+Updated `@actions/*` dependencies to avoid using deprecated features of the runner.
diff --git a/package.json b/package.json
@@ -24,9 +24,9 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@actions/core": "^1.3.0",
-    "@actions/exec": "^1.1.0",
-    "@actions/github": "^4.0.0",
+    "@actions/core": "^1.10.0",
+    "@actions/exec": "^1.1.1",
+    "@actions/github": "^5.1.1",
     "@babel/core": "^7.13.10",
     "@babel/preset-env": "^7.13.10",
     "@babel/preset-typescript": "^7.13.0",
diff --git a/src/gitUtils.ts b/src/gitUtils.ts
@@ -1,5 +1,4 @@
-import { exec } from "@actions/exec";
-import { execWithOutput } from "./utils";
+import { exec, getExecOutput } from "@actions/exec";
 
 export const setupUser = async () => {
   await exec("git", [
@@ -35,7 +34,7 @@ export const pushTags = async () => {
 };
 
 export const switchToMaybeExistingBranch = async (branch: string) => {
-  let { stderr } = await execWithOutput("git", ["checkout", branch], {
+  let { stderr } = await getExecOutput("git", ["checkout", branch], {
     ignoreReturnCode: true,
   });
   let isCreatingBranch = !stderr
@@ -59,6 +58,6 @@ export const commitAll = async (message: string) => {
 };
 
 export const checkIfClean = async (): Promise<boolean> => {
-  const { stdout } = await execWithOutput("git", ["status", "--porcelain"]);
+  const { stdout } = await getExecOutput("git", ["status", "--porcelain"]);
   return !stdout.length;
 };
diff --git a/src/run.test.ts b/src/run.test.ts
@@ -30,7 +30,9 @@ let mockedGithubMethods = {
     createRelease: jest.fn(),
   },
 };
-(github.getOctokit as any).mockImplementation(() => mockedGithubMethods);
+(github.getOctokit as any).mockImplementation(() => ({
+  rest: mockedGithubMethods,
+}));
 
 let f = fixturez(__dirname);
 
diff --git a/src/run.ts b/src/run.ts
@@ -1,4 +1,4 @@
-import { exec } from "@actions/exec";
+import { exec, getExecOutput } from "@actions/exec";
 import * as github from "@actions/github";
 import fs from "fs-extra";
 import { getPackages, Package } from "@manypkg/get-packages";
@@ -7,7 +7,6 @@ import * as semver from "semver";
 import { PreState } from "@changesets/types";
 import {
   getChangelogEntry,
-  execWithOutput,
   getChangedPackages,
   sortTheThings,
   getVersionsByDirectory,
@@ -40,14 +39,14 @@ const createRelease = async (
       );
     }
 
-    await octokit.repos.createRelease({
+    await octokit.rest.repos.createRelease({
       name: tagName,
       tag_name: tagName,
       body: changelogEntry.content,
       prerelease: pkg.packageJson.version.includes("-"),
       ...github.context.repo,
     });
-  } catch (err: any) {
+  } catch (err) {
     // if we can't find a changelog, the user has probably disabled changelogs
     if (err.code !== "ENOENT") {
       throw err;
@@ -82,7 +81,7 @@ export async function runPublish({
   let octokit = github.getOctokit(githubToken);
   let [publishCommand, ...publishArgs] = script.split(/\s+/);
 
-  let changesetPublishOutput = await execWithOutput(
+  let changesetPublishOutput = await getExecOutput(
     publishCommand,
     publishArgs,
     { cwd }
@@ -165,7 +164,7 @@ export async function runPublish({
 const requireChangesetsCliPkgJson = (cwd: string) => {
   try {
     return require(resolveFrom(cwd, "@changesets/cli/package.json"));
-  } catch (err: any) {
+  } catch (err) {
     if (err && err.code === "MODULE_NOT_FOUND") {
       throw new Error(
         `Have you forgotten to install \`@changesets/cli\` in "${cwd}"?`
@@ -292,7 +291,7 @@ export async function runVersion({
   }
 
   let searchQuery = `repo:${repo}+state:open+head:${versionBranch}+base:${branch}+is:pull-request`;
-  let searchResultPromise = octokit.search.issuesAndPullRequests({
+  let searchResultPromise = octokit.rest.search.issuesAndPullRequests({
     q: searchQuery,
   });
   let changedPackages = await getChangedPackages(cwd, versionsByDirectory);
@@ -342,7 +341,7 @@ export async function runVersion({
 
   if (searchResult.data.items.length === 0) {
     console.log("creating pull request");
-    const { data: newPullRequest } = await octokit.pulls.create({
+    const { data: newPullRequest } = await octokit.rest.pulls.create({
       base: branch,
       head: versionBranch,
       title: finalPrTitle,
@@ -357,7 +356,7 @@ export async function runVersion({
     const [pullRequest] = searchResult.data.items;
 
     console.log(`updating found pull request #${pullRequest.number}`);
-    await octokit.pulls.update({
+    await octokit.rest.pulls.update({
       pull_number: pullRequest.number,
       title: finalPrTitle,
       body: prBody,
diff --git a/src/utils.ts b/src/utils.ts
@@ -87,32 +87,6 @@ export function getChangelogEntry(changelog: string, version: string) {
   };
 }
 
-export async function execWithOutput(
-  command: string,
-  args?: string[],
-  options?: { ignoreReturnCode?: boolean; cwd?: string }
-) {
-  let myOutput = "";
-  let myError = "";
-
-  return {
-    code: await exec(command, args, {
-      listeners: {
-        stdout: (data: Buffer) => {
-          myOutput += data.toString();
-        },
-        stderr: (data: Buffer) => {
-          myError += data.toString();
-        },
-      },
-
-      ...options,
-    }),
-    stdout: myOutput,
-    stderr: myError,
-  };
-}
-
 export function sortTheThings(
   a: { private: boolean; highestLevel: number },
   b: { private: boolean; highestLevel: number }
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@changesets/action": patch
 +---
++
 +Updated `@actions/*` dependencies to avoid using deprecated features of the runner.