Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(action): use octokit.rest.repos instead of octokit.repos #253

Merged
merged 9 commits into from
Dec 23, 2022
Merged

fix(action): use octokit.rest.repos instead of octokit.repos #253

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
44fad19
fix(action): use octokit.rest.repos instead of octokit.repos
lucasfernog Dec 15, 2022
9dda5c8
Merge branch 'main' into fix/octokit-calls
jbolda Dec 22, 2022
7dac44b
address comments
jbolda Dec 22, 2022
3e7f6c7
InstanceType<typeof GitHub> from @actions/github/lib/utils
jbolda Dec 22, 2022
1c19fe8
missed committing the file
jbolda Dec 22, 2022
cb167fd
remove custom types set for releases
jbolda Dec 22, 2022
9b06b65
update mocks to consider
jbolda Dec 22, 2022
527a8a4
reroll lockfile
jbolda Dec 22, 2022
404c671
it really is a buffer
jbolda Dec 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 74 additions & 1 deletion packages/action/dist/index.js
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 18 additions & 13 deletions packages/action/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import fs from "fs";
import type { ConfigFile, FunctionPipe } from "../../types/src";
import { Octokit } from '@octokit/core';

declare const GitHub: typeof Octokit & import("@octokit/plugin-rest-endpoint-methods/dist-types/types").Api & {
paginate: import("@octokit/plugin-paginate-rest").PaginateInterface;
}

export const commandText = (pkg: {
precommand: string | boolean | null;
Expand Down Expand Up @@ -89,9 +94,8 @@ type GithubRelease = {
tag_name: string;
draft: boolean;
prerelease: boolean;
};
type GithubReleaseResponse = {
data: GithubRelease;
url: string;
upload_url: string;
};
type GithubReleaseResponses = {
data: GithubRelease[];
Expand All @@ -106,7 +110,7 @@ export const createReleases = curry(
repo,
}: {
core: Methods;
octokit: MoreMethods;
octokit: typeof GitHub;
owner: string;
repo: string;
},
Expand All @@ -128,7 +132,7 @@ export const createReleases = curry(

const releaseTag = pipe.releaseTag;
core.debug(`creating release with tag ${releaseTag}`);
const existingRelease = await octokit.repos
const existingRelease = await octokit.rest.repos
.listReleases({
owner,
repo,
Expand All @@ -141,27 +145,27 @@ export const createReleases = curry(
})
.catch((error: Error) => null);

let releaseResponse;
let releaseResponse: GithubRelease;
if (existingRelease && existingRelease.draft) {
console.log(
`updating and publishing Github Release for ${pipe.pkg}@${pipe.pkgFile.version}`
);
releaseResponse = await octokit.repos
releaseResponse = await octokit.rest.repos
.updateRelease({
owner,
repo,
release_id: existingRelease.id,
body: `${
existingRelease.body ? `${existingRelease.body}\n` : ""
}${commandText(pipe.pkgCommandsRan)}`,
}${commandText(pipe.pkgCommandsRan)}`,
draft: false,
})
.then((response: GithubReleaseResponse) => response.data);
.then((response) => response.data);
} else {
console.log(
`creating Github Release for ${pipe.pkg}@${pipe.pkgFile.version}`
);
releaseResponse = await octokit.repos
releaseResponse = await octokit.rest.repos
.createRelease({
owner,
repo,
Expand All @@ -170,7 +174,7 @@ export const createReleases = curry(
body: commandText(pipe.pkgCommandsRan),
draft: core.getInput("draftRelease") === "true" ? true : false,
})
.then((response: GithubReleaseResponse) => response.data);
.then((response) => response.data);
}
// keeping this one since this was originally used
// considered deprecated and will remove in v1
Expand Down Expand Up @@ -205,15 +209,16 @@ export const createReleases = curry(
console.log(
`uploading asset ${asset.name} for ${pipe.pkg}@${pipe.pkgFile.version}`
);
const uploadedAsset = await octokit.repos
const uploadedAsset = await octokit.rest.repos
.uploadReleaseAsset({
owner,
repo,
release_id: releaseResponse.id,
name: asset.name,
// @ts-ignore error TS2322: Type 'Buffer' is not assignable to type 'string'.
data: fs.readFileSync(asset.path),
})
.then((response: GithubReleaseResponse) => response.data);
.then((response) => response.data);
core.startGroup(`asset uploaded to release for ${pipe.pkg}`);
console.log("release created: ", uploadedAsset);
core.endGroup();
Expand Down