@@ -7949,7 +7949,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
79497949};
79507950Object.defineProperty(exports, "__esModule", ({ value: true }));
79517951exports.getLabels = void 0;
7952- var core = __nccwpck_require__(2186 );
7952+ var request_error_1 = __nccwpck_require__(537 );
79537953function getLabels(octokit, prNumber, repoName, owner) {
79547954 return __awaiter(this, void 0, void 0, function () {
79557955 var res;
@@ -7958,10 +7958,12 @@ function getLabels(octokit, prNumber, repoName, owner) {
79587958 case 0: return [4 /*yield*/, doRequest(octokit, prNumber, repoName, owner)];
79597959 case 1:
79607960 res = _a.sent();
7961+ if (res instanceof request_error_1.RequestError) {
7962+ throw res;
7963+ }
79617964 if (res.status === 200) {
79627965 return [2 /*return*/, res.data.map(function (label) { return label.name; })];
79637966 }
7964- core.error("Error: ".concat(res));
79657967 return [2 /*return*/, undefined];
79667968 }
79677969 });
@@ -7974,7 +7976,7 @@ function doRequest(octokit, prNumber, repoName, owner) {
79747976 return __generator(this, function (_a) {
79757977 switch (_a.label) {
79767978 case 0:
7977- request = "GET /repos/".concat( owner, "/").concat(repoName, " /issues/").concat(prNumber, " /labels") ;
7979+ request = "GET /repos/{ owner}/{repo} /issues/{issue_number} /labels";
79787980 _a.label = 1;
79797981 case 1:
79807982 _a.trys.push([1, 3, , 4]);
@@ -7993,7 +7995,10 @@ function doRequest(octokit, prNumber, repoName, owner) {
79937995 }];
79947996 case 3:
79957997 error_1 = _a.sent();
7996- return [2 /*return*/, error_1];
7998+ return [2 /*return*/, new request_error_1.RequestError(error_1.message, error_1.status, {
7999+ request: error_1.request,
8000+ response: error_1.response,
8001+ })];
79978002 case 4: return [2 /*return*/];
79988003 }
79998004 });
@@ -8004,10 +8009,46 @@ function doRequest(octokit, prNumber, repoName, owner) {
80048009/***/ }),
80058010
80068011/***/ 399:
8007- /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
8012+ /***/ (function (__unused_webpack_module, exports, __nccwpck_require__) {
80088013
80098014"use strict";
80108015
8016+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
8017+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
8018+ return new (P || (P = Promise))(function (resolve, reject) {
8019+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
8020+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
8021+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8022+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8023+ });
8024+ };
8025+ var __generator = (this && this.__generator) || function (thisArg, body) {
8026+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
8027+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
8028+ function verb(n) { return function (v) { return step([n, v]); }; }
8029+ function step(op) {
8030+ if (f) throw new TypeError("Generator is already executing.");
8031+ while (_) try {
8032+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
8033+ if (y = 0, t) op = [op[0] & 2, t.value];
8034+ switch (op[0]) {
8035+ case 0: case 1: t = op; break;
8036+ case 4: _.label++; return { value: op[1], done: false };
8037+ case 5: _.label++; y = op[1]; op = [0]; continue;
8038+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
8039+ default:
8040+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
8041+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
8042+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
8043+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
8044+ if (t[2]) _.ops.pop();
8045+ _.trys.pop(); continue;
8046+ }
8047+ op = body.call(thisArg, _);
8048+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
8049+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
8050+ }
8051+ };
80118052Object.defineProperty(exports, "__esModule", ({ value: true }));
80128053exports.main = void 0;
80138054var core = __nccwpck_require__(2186);
@@ -8016,60 +8057,68 @@ var getLabels_1 = __nccwpck_require__(7140);
80168057var searchPRwithLabels_1 = __nccwpck_require__(3595);
80178058var searchCodePR_1 = __nccwpck_require__(5433);
80188059var mergePR_1 = __nccwpck_require__(6964);
8019- var main = function (octokit, input, merge) {
8020- var prNumber = input.prNumber;
8021- var repoName = input.repoName;
8022- var owner = input.owner;
8023- core.info("PR Number: ".concat(prNumber));
8024- core.info("Repo Name: ".concat(repoName));
8025- return (0, getLabels_1.getLabels)(octokit, prNumber, repoName, owner).then(function (labels) {
8026- core.info("Labels: ".concat(labels));
8027- if (labels === undefined) {
8028- core.setFailed("Request label failed");
8029- return core.ExitCode.Failure;
8030- }
8031- return (0, searchPRwithLabels_1.searchPRwithLabels)(octokit, repoName, owner, labels).then(function (PRs) {
8032- core.info("PRs: ".concat(PRs));
8033- if (PRs === undefined) {
8034- core.setFailed("Request PRs failed");
8035- return core.ExitCode.Failure;
8036- }
8037- if (PRs.length > 0) {
8038- core.info('PRs found, nothing to merge');
8039- return core.ExitCode.Success;
8040- }
8041- else {
8042- core.info('No PRs found, merge original code PR');
8043- return (0, searchCodePR_1.searchCodePR)(octokit, prNumber, repoName, owner).then(function (codePR) {
8060+ function main(octokit, input, merge) {
8061+ return __awaiter(this, void 0, void 0, function () {
8062+ var prNumber, repoName, owner, labels, labelsToSearch, PRs, codePR, error_1;
8063+ return __generator(this, function (_a) {
8064+ switch (_a.label) {
8065+ case 0:
8066+ prNumber = input.prNumber;
8067+ repoName = input.repoName;
8068+ owner = input.owner;
8069+ core.info("PR Number: ".concat(prNumber));
8070+ core.info("Repo Name: ".concat(repoName));
8071+ _a.label = 1;
8072+ case 1:
8073+ _a.trys.push([1, 7, , 8]);
8074+ return [4 /*yield*/, (0, getLabels_1.getLabels)(octokit, prNumber, repoName, owner)];
8075+ case 2:
8076+ labels = _a.sent();
8077+ core.info("Labels: ".concat(labels));
8078+ labelsToSearch = labels.filter(function (label) { return !label.endsWith("-pro"); });
8079+ return [4 /*yield*/, (0, searchPRwithLabels_1.searchPRwithLabels)(octokit, repoName, owner, labelsToSearch)];
8080+ case 3:
8081+ PRs = _a.sent();
8082+ core.info("PRs: ".concat(PRs));
8083+ if (!(PRs.length > 0)) return [3 /*break*/, 4];
8084+ core.info('PRs found, nothing to merge');
8085+ return [2 /*return*/, core.ExitCode.Success];
8086+ case 4:
8087+ core.info('No PRs found, merge original code PR');
8088+ return [4 /*yield*/, (0, searchCodePR_1.searchCodePR)(octokit, prNumber, repoName, owner)];
8089+ case 5:
8090+ codePR = _a.sent();
80448091 core.info("Repo: ".concat(codePR.base.repo.name, " PR: ").concat(codePR === null || codePR === void 0 ? void 0 : codePR.number));
8045- if (codePR === undefined) {
8046- core.setFailed("Request code PR failed");
8047- return core.ExitCode.Failure;
8048- }
80498092 if (merge) {
8050- return (0, mergePR_1.mergePR)(octokit, codePR.number.toString(), codePR.base.repo.name, owner).then(function (mergeResult) {
8051- core.info("Merge Result: ".concat(mergeResult));
8052- if (mergeResult === undefined) {
8053- core.setFailed("Merge PR failed");
8054- }
8055- return core.ExitCode.Success;
8056- });
8093+ return [2 /*return*/, (0, mergePR_1.mergePR)(octokit, codePR.number, codePR.base.repo.name, owner).then(function (mergeResult) {
8094+ core.info("Merge Result: ".concat(mergeResult));
8095+ if (mergeResult === undefined) {
8096+ core.setFailed("Merge PR failed");
8097+ return core.ExitCode.Failure;
8098+ }
8099+ return core.ExitCode.Success;
8100+ })];
80578101 }
8058- return core.ExitCode.Success;
8059- });
8102+ return [2 /*return*/, core.ExitCode.Success];
8103+ case 6: return [3 /*break*/, 8];
8104+ case 7:
8105+ error_1 = _a.sent();
8106+ core.setFailed(error_1.message);
8107+ return [2 /*return*/, Promise.resolve(core.ExitCode.Failure)];
8108+ case 8: return [2 /*return*/];
80608109 }
80618110 });
80628111 });
8063- };
8112+ }
80648113exports.main = main;
80658114try {
8066- var prNumber = core.getInput('pr_number');
8115+ var prNumber = parseInt( core.getInput('pr_number') );
80678116 var repoName = core.getInput('repo_name');
80688117 var owner = core.getInput('owner');
80698118 var octokit = new core_1.Octokit({
80708119 auth: process.env.GITHUB_TOKEN
80718120 });
8072- (0, exports. main) (octokit, { prNumber: prNumber, repoName: repoName, owner: owner }, false);
8121+ main(octokit, { prNumber: prNumber, repoName: repoName, owner: owner }, false);
80738122}
80748123catch (error) {
80758124 core.setFailed(error.message);
@@ -8121,7 +8170,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
81218170};
81228171Object.defineProperty(exports, "__esModule", ({ value: true }));
81238172exports.mergePR = void 0;
8124- var core = __nccwpck_require__(2186 );
8173+ var request_error_1 = __nccwpck_require__(537 );
81258174function mergePR(octokit, prNumber, repoName, owner) {
81268175 return __awaiter(this, void 0, void 0, function () {
81278176 var res;
@@ -8130,10 +8179,12 @@ function mergePR(octokit, prNumber, repoName, owner) {
81308179 case 0: return [4 /*yield*/, doRequest(octokit, prNumber, repoName, owner)];
81318180 case 1:
81328181 res = _a.sent();
8182+ if (res instanceof request_error_1.RequestError) {
8183+ throw res;
8184+ }
81338185 if (res.status === 200) {
81348186 return [2 /*return*/, res.data];
81358187 }
8136- core.error("Error: ".concat(res));
81378188 return [2 /*return*/, undefined];
81388189 }
81398190 });
@@ -8146,7 +8197,7 @@ function doRequest(octokit, prNumber, repoName, owner) {
81468197 return __generator(this, function (_a) {
81478198 switch (_a.label) {
81488199 case 0:
8149- request = "PUT /repos/".concat( owner, "/").concat(repoName, " /pulls/").concat(prNumber, " /merge") ;
8200+ request = "PUT /repos/{ owner}/{repo} /pulls/{pull_number} /merge";
81508201 _a.label = 1;
81518202 case 1:
81528203 _a.trys.push([1, 3, , 4]);
@@ -8165,7 +8216,10 @@ function doRequest(octokit, prNumber, repoName, owner) {
81658216 }];
81668217 case 3:
81678218 error_1 = _a.sent();
8168- return [2 /*return*/, error_1];
8219+ return [2 /*return*/, new request_error_1.RequestError(error_1.message, error_1.status, {
8220+ request: error_1.request,
8221+ response: error_1.response,
8222+ })];
81698223 case 4: return [2 /*return*/];
81708224 }
81718225 });
@@ -8218,7 +8272,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
82188272};
82198273Object.defineProperty(exports, "__esModule", ({ value: true }));
82208274exports.searchCodePR = void 0;
8221- var core = __nccwpck_require__(2186 );
8275+ var request_error_1 = __nccwpck_require__(537 );
82228276function searchCodePR(octokit, prNumber, repoName, owner) {
82238277 return __awaiter(this, void 0, void 0, function () {
82248278 var res, re, match, originalRepoName, originalPrNumber, original;
@@ -8227,22 +8281,26 @@ function searchCodePR(octokit, prNumber, repoName, owner) {
82278281 case 0: return [4 /*yield*/, doRequest(octokit, prNumber, repoName, owner)];
82288282 case 1:
82298283 res = _a.sent();
8284+ if (res instanceof request_error_1.RequestError) {
8285+ throw res;
8286+ }
82308287 if (!(res.status === 200)) return [3 /*break*/, 3];
82318288 re = /^([a-z\-1-9]+)\s([a-z-]+)\s\#pr(\d+)$/;
82328289 match = res.data.title.match(re);
82338290 if (!match) return [3 /*break*/, 3];
82348291 originalRepoName = match[1];
8235- originalPrNumber = match[3];
8292+ originalPrNumber = parseInt( match[3]) ;
82368293 return [4 /*yield*/, doRequest(octokit, originalPrNumber, originalRepoName, owner)];
82378294 case 2:
82388295 original = _a.sent();
8296+ if (original instanceof request_error_1.RequestError) {
8297+ throw res;
8298+ }
82398299 if (original.status === 200) {
82408300 return [2 /*return*/, original.data];
82418301 }
82428302 _a.label = 3;
8243- case 3:
8244- core.error("Error: ".concat(res));
8245- return [2 /*return*/, undefined];
8303+ case 3: return [2 /*return*/, undefined];
82468304 }
82478305 });
82488306 });
@@ -8254,7 +8312,7 @@ function doRequest(octokit, prNumber, repoName, owner) {
82548312 return __generator(this, function (_a) {
82558313 switch (_a.label) {
82568314 case 0:
8257- request = "GET /repos/".concat( owner, "/").concat(repoName, " /pulls/").concat(prNumber) ;
8315+ request = "GET /repos/{ owner}/{repo} /pulls/{pull_number}" ;
82588316 _a.label = 1;
82598317 case 1:
82608318 _a.trys.push([1, 3, , 4]);
@@ -8273,7 +8331,10 @@ function doRequest(octokit, prNumber, repoName, owner) {
82738331 }];
82748332 case 3:
82758333 error_1 = _a.sent();
8276- return [2 /*return*/, error_1];
8334+ return [2 /*return*/, new request_error_1.RequestError(error_1.message, error_1.status, {
8335+ request: error_1.request,
8336+ response: error_1.response,
8337+ })];
82778338 case 4: return [2 /*return*/];
82788339 }
82798340 });
@@ -8326,7 +8387,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
83268387};
83278388Object.defineProperty(exports, "__esModule", ({ value: true }));
83288389exports.searchPRwithLabels = void 0;
8329- var core = __nccwpck_require__(2186 );
8390+ var request_error_1 = __nccwpck_require__(537 );
83308391function searchPRwithLabels(octokit, repoName, owner, labels) {
83318392 return __awaiter(this, void 0, void 0, function () {
83328393 var res;
@@ -8335,10 +8396,12 @@ function searchPRwithLabels(octokit, repoName, owner, labels) {
83358396 case 0: return [4 /*yield*/, doRequest(octokit, repoName, owner, labels)];
83368397 case 1:
83378398 res = _a.sent();
8399+ if (res instanceof request_error_1.RequestError) {
8400+ throw res;
8401+ }
83388402 if (res.status === 200) {
83398403 return [2 /*return*/, res.data.map(function (issue) { return issue.number; })];
83408404 }
8341- core.error("Error: ".concat(res));
83428405 return [2 /*return*/, undefined];
83438406 }
83448407 });
@@ -8351,14 +8414,14 @@ function doRequest(octokit, repoName, owner, labels) {
83518414 return __generator(this, function (_a) {
83528415 switch (_a.label) {
83538416 case 0:
8354- request = "GET /repos/".concat( owner, "/").concat(repoName, " /issues") ;
8417+ request = "GET /repos/{ owner}/{repo} /issues";
83558418 _a.label = 1;
83568419 case 1:
83578420 _a.trys.push([1, 3, , 4]);
83588421 return [4 /*yield*/, octokit.request(request, {
83598422 owner: owner,
83608423 repo: repoName,
8361- labels: labels
8424+ labels: labels.join(","),
83628425 })];
83638426 case 2:
83648427 res = (_a.sent()).data;
@@ -8370,7 +8433,10 @@ function doRequest(octokit, repoName, owner, labels) {
83708433 }];
83718434 case 3:
83728435 error_1 = _a.sent();
8373- return [2 /*return*/, error_1];
8436+ return [2 /*return*/, new request_error_1.RequestError(error_1.message, error_1.status, {
8437+ request: error_1.request,
8438+ response: error_1.response,
8439+ })];
83748440 case 4: return [2 /*return*/];
83758441 }
83768442 });
0 commit comments