Updating bundled toolkit packages and fix error

This commit is contained in:
Jacob Wallraff
2022-10-03 15:23:34 -07:00
parent dafa9ae191
commit 6b06292965
13 changed files with 44 additions and 30 deletions

View File

@@ -1,19 +1,32 @@
"use strict"; "use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
return new (P || (P = Promise))(function (resolve, reject) { if (k2 === undefined) k2 = k;
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } }) : (function(o, m, k, k2) {
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } if (k2 === undefined) k2 = k;
step((generator = generator.apply(thisArg, _arguments || [])).next()); o[k2] = m[k];
}); }));
}; var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) { var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod; if (mod && mod.__esModule) return mod;
var result = {}; var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
result["default"] = mod; __setModuleDefault(result, mod);
return result; return result;
}; };
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
const core = __importStar(require("@actions/core")); const core = __importStar(require("@actions/core"));
const github = __importStar(require("@actions/github")); const github = __importStar(require("@actions/github"));
@@ -26,7 +39,7 @@ function run() {
throw new Error('Action must have at least one of issue-message or pr-message set'); throw new Error('Action must have at least one of issue-message or pr-message set');
} }
// Get client and context // Get client and context
const client = new github.GitHub(core.getInput('repo-token', { required: true })); const client = github.getOctokit(core.getInput('repo-token', { required: true }));
const context = github.context; const context = github.context;
if (context.payload.action !== 'opened') { if (context.payload.action !== 'opened') {
console.log('No issue or PR was opened, skipping'); console.log('No issue or PR was opened, skipping');
@@ -66,7 +79,7 @@ function run() {
// Add a comment to the appropriate place // Add a comment to the appropriate place
console.log(`Adding message: ${message} to ${issueType} ${issue.number}`); console.log(`Adding message: ${message} to ${issueType} ${issue.number}`);
if (isIssue) { if (isIssue) {
yield client.issues.createComment({ yield client.rest.issues.createComment({
owner: issue.owner, owner: issue.owner,
repo: issue.repo, repo: issue.repo,
issue_number: issue.number, issue_number: issue.number,
@@ -74,7 +87,7 @@ function run() {
}); });
} }
else { else {
yield client.pulls.createReview({ yield client.rest.pulls.createReview({
owner: issue.owner, owner: issue.owner,
repo: issue.repo, repo: issue.repo,
pull_number: issue.number, pull_number: issue.number,
@@ -91,7 +104,7 @@ function run() {
} }
function isFirstIssue(client, owner, repo, sender, curIssueNumber) { function isFirstIssue(client, owner, repo, sender, curIssueNumber) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const { status, data: issues } = yield client.issues.listForRepo({ const { status, data: issues } = yield client.rest.issues.listForRepo({
owner: owner, owner: owner,
repo: repo, repo: repo,
creator: sender, creator: sender,
@@ -113,10 +126,11 @@ function isFirstIssue(client, owner, repo, sender, curIssueNumber) {
} }
// No way to filter pulls by creator // No way to filter pulls by creator
function isFirstPull(client, owner, repo, sender, curPullNumber, page = 1) { function isFirstPull(client, owner, repo, sender, curPullNumber, page = 1) {
var _a;
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
// Provide console output if we loop for a while. // Provide console output if we loop for a while.
console.log('Checking...'); console.log('Checking...');
const { status, data: pulls } = yield client.pulls.list({ const { status, data: pulls } = yield client.rest.pulls.list({
owner: owner, owner: owner,
repo: repo, repo: repo,
per_page: 100, per_page: 100,
@@ -130,7 +144,7 @@ function isFirstPull(client, owner, repo, sender, curPullNumber, page = 1) {
return true; return true;
} }
for (const pull of pulls) { for (const pull of pulls) {
const login = pull.user.login; const login = (_a = pull.user) === null || _a === void 0 ? void 0 : _a.login;
if (login === sender && pull.number < curPullNumber) { if (login === sender && pull.number < curPullNumber) {
return false; return false;
} }

View File

@@ -26,11 +26,11 @@
}, },
"homepage": "https://github.com/actions/first-interaction#readme", "homepage": "https://github.com/actions/first-interaction#readme",
"dependencies": { "dependencies": {
"@actions/core": "file:toolkit/actions-core-0.0.0.tgz", "@actions/core": "file:toolkit/actions-core-1.10.0.tgz",
"@actions/exec": "file:toolkit/actions-exec-0.0.0.tgz", "@actions/exec": "file:toolkit/actions-exec-1.1.1.tgz",
"@actions/github": "file:toolkit/actions-github-0.0.0.tgz", "@actions/github": "file:toolkit/actions-github-5.1.1.tgz",
"@actions/io": "file:toolkit/actions-io-0.0.0.tgz", "@actions/io": "file:toolkit/actions-io-1.1.2.tgz",
"@actions/tool-cache": "file:toolkit/actions-tool-cache-0.0.0.tgz" "@actions/tool-cache": "file:toolkit/actions-tool-cache-2.0.1.tgz"
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "^24.0.13", "@types/jest": "^24.0.13",

View File

@@ -11,7 +11,7 @@ async function run() {
); );
} }
// Get client and context // Get client and context
const client: github.GitHub = new github.GitHub( const client = github.getOctokit(
core.getInput('repo-token', {required: true}) core.getInput('repo-token', {required: true})
); );
const context = github.context; const context = github.context;
@@ -71,14 +71,14 @@ async function run() {
// Add a comment to the appropriate place // Add a comment to the appropriate place
console.log(`Adding message: ${message} to ${issueType} ${issue.number}`); console.log(`Adding message: ${message} to ${issueType} ${issue.number}`);
if (isIssue) { if (isIssue) {
await client.issues.createComment({ await client.rest.issues.createComment({
owner: issue.owner, owner: issue.owner,
repo: issue.repo, repo: issue.repo,
issue_number: issue.number, issue_number: issue.number,
body: message body: message
}); });
} else { } else {
await client.pulls.createReview({ await client.rest.pulls.createReview({
owner: issue.owner, owner: issue.owner,
repo: issue.repo, repo: issue.repo,
pull_number: issue.number, pull_number: issue.number,
@@ -87,19 +87,19 @@ async function run() {
}); });
} }
} catch (error) { } catch (error) {
core.setFailed(error.message); core.setFailed((error as any).message);
return; return;
} }
} }
async function isFirstIssue( async function isFirstIssue(
client: github.GitHub, client: ReturnType<typeof github.getOctokit>,
owner: string, owner: string,
repo: string, repo: string,
sender: string, sender: string,
curIssueNumber: number curIssueNumber: number
): Promise<boolean> { ): Promise<boolean> {
const {status, data: issues} = await client.issues.listForRepo({ const {status, data: issues} = await client.rest.issues.listForRepo({
owner: owner, owner: owner,
repo: repo, repo: repo,
creator: sender, creator: sender,
@@ -125,7 +125,7 @@ async function isFirstIssue(
// No way to filter pulls by creator // No way to filter pulls by creator
async function isFirstPull( async function isFirstPull(
client: github.GitHub, client: ReturnType<typeof github.getOctokit>,
owner: string, owner: string,
repo: string, repo: string,
sender: string, sender: string,
@@ -134,7 +134,7 @@ async function isFirstPull(
): Promise<boolean> { ): Promise<boolean> {
// Provide console output if we loop for a while. // Provide console output if we loop for a while.
console.log('Checking...'); console.log('Checking...');
const {status, data: pulls} = await client.pulls.list({ const {status, data: pulls} = await client.rest.pulls.list({
owner: owner, owner: owner,
repo: repo, repo: repo,
per_page: 100, per_page: 100,
@@ -151,7 +151,7 @@ async function isFirstPull(
} }
for (const pull of pulls) { for (const pull of pulls) {
const login: string = pull.user.login; const login = pull.user?.login;
if (login === sender && pull.number < curPullNumber) { if (login === sender && pull.number < curPullNumber) {
return false; return false;
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.